Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ports/trieste/artifact-names.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/parsers/json/CMakeLists.txt b/parsers/json/CMakeLists.txt
index ac253e1..a596443 100644
--- a/parsers/json/CMakeLists.txt
+++ b/parsers/json/CMakeLists.txt
@@ -11,6 +11,7 @@ else()
add_library(json STATIC ${SOURCES})
endif()
enable_warnings(json)
+set_target_properties(json PROPERTIES OUTPUT_NAME trieste-json)

add_library(trieste::json ALIAS json)

diff --git a/parsers/yaml/CMakeLists.txt b/parsers/yaml/CMakeLists.txt
index 075ed2d..e07feba 100644
--- a/parsers/yaml/CMakeLists.txt
+++ b/parsers/yaml/CMakeLists.txt
@@ -13,6 +13,7 @@ else()
add_library(yaml STATIC ${SOURCES})
endif()
enable_warnings(yaml)
+set_target_properties(yaml PROPERTIES OUTPUT_NAME trieste-yaml)

add_library(trieste::yaml ALIAS yaml)

9 changes: 5 additions & 4 deletions ports/trieste/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 cd92ef15181c7adc4e777342b9e5ae60ec1b12356d3742044d98e54d3f9a44012c377eafbc02f92afc7f80e963b32a22e5230f765a2f63345139050512bc3af0
HEAD_REF main
PATCHES
artifact-names.diff
)

# NOTE: The CI overlay port (see .github/workflows/buildtest.yml,
Expand All @@ -15,7 +17,7 @@ if("parsers" IN_LIST FEATURES)
# The parser libraries lack __declspec(dllexport) annotations,
# so they must be built as static libraries on Windows.
if(VCPKG_TARGET_IS_WINDOWS)
set(VCPKG_LIBRARY_LINKAGE static)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()
else()
set(BUILD_PARSERS OFF)
Expand All @@ -26,6 +28,7 @@ endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-DTRIESTE_USE_FETCH_CONTENT=OFF
-DTRIESTE_BUILD_SAMPLES=OFF
-DTRIESTE_BUILD_PARSERS=${BUILD_PARSERS}
Expand All @@ -34,11 +37,9 @@ vcpkg_cmake_configure(
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(PACKAGE_NAME trieste CONFIG_PATH share/trieste/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH share/trieste/cmake)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

if(NOT "parsers" IN_LIST FEATURES)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
endif()
Expand Down
11 changes: 5 additions & 6 deletions ports/trieste/usage
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
trieste provides CMake targets:

find_package(trieste CONFIG REQUIRED)
target_link_libraries(<your-target> PRIVATE trieste::trieste)
find_package(trieste CONFIG REQUIRED)
target_link_libraries(main PRIVATE trieste::trieste)

When installed with the "parsers" feature (vcpkg install trieste[parsers]):

target_link_libraries(<your-target> PRIVATE trieste::json)
target_link_libraries(<your-target> PRIVATE trieste::yaml)
# Targets provided by trieste[parsers]:
target_link_libraries(main PRIVATE trieste::json)
target_link_libraries(main PRIVATE trieste::yaml)
1 change: 1 addition & 0 deletions ports/trieste/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "trieste",
"version": "1.0.0",
"port-version": 1,
"description": "A header-only C++20 term rewriting system for rapidly prototyping programming languages",
"homepage": "https://github.com/microsoft/Trieste",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -10190,7 +10190,7 @@
},
"trieste": {
"baseline": "1.0.0",
"port-version": 0
"port-version": 1
},
"triton": {
"baseline": "2025-02-15",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/trieste.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "25b6a9820380be0dad2bad0614fe095e3585ed90",
"version": "1.0.0",
"port-version": 1
},
{
"git-tree": "0adfdb1fb82a3c09110728d531d3abdc0cd81222",
"version": "1.0.0",
Expand Down