[trieste] Update to 1.1.0 (#51142)

This commit is contained in:
Matthew A Johnson 2026-04-13 23:01:26 +01:00 committed by GitHub
parent d7ffd12762
commit 47e6ef4e39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 38 deletions

View File

@ -1,24 +0,0 @@
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)

View File

@ -2,10 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/Trieste
REF "v${VERSION}"
SHA512 cd92ef15181c7adc4e777342b9e5ae60ec1b12356d3742044d98e54d3f9a44012c377eafbc02f92afc7f80e963b32a22e5230f765a2f63345139050512bc3af0
SHA512 5499e461e92c2d86853e9666c003e755c6d77f2dde0bd44f12a09a4fc7a2446e871d34fcc769b18f5ee87f8ceea79476284620d50c61ef1593e7126d273f79fc
HEAD_REF main
PATCHES
artifact-names.diff
)
# NOTE: The CI overlay port (see .github/workflows/buildtest.yml,
@ -14,17 +12,18 @@ vcpkg_from_github(
# this line, update the sed pattern there.
if("parsers" IN_LIST FEATURES)
set(BUILD_PARSERS ON)
# The parser libraries lack __declspec(dllexport) annotations,
# so they must be built as static libraries on Windows.
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()
else()
set(BUILD_PARSERS OFF)
# Without parsers, this is a header-only library.
set(VCPKG_BUILD_TYPE release)
endif()
if("snmalloc" IN_LIST FEATURES)
set(USE_SNMALLOC ON)
else()
set(USE_SNMALLOC OFF)
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
@ -33,7 +32,7 @@ vcpkg_cmake_configure(
-DTRIESTE_BUILD_SAMPLES=OFF
-DTRIESTE_BUILD_PARSERS=${BUILD_PARSERS}
-DTRIESTE_ENABLE_TESTING=OFF
-DTRIESTE_USE_SNMALLOC=OFF
-DTRIESTE_USE_SNMALLOC=${USE_SNMALLOC}
)
vcpkg_cmake_install()

View File

@ -1,14 +1,12 @@
{
"name": "trieste",
"version": "1.0.0",
"port-version": 1,
"version": "1.1.0",
"description": "A header-only C++20 term rewriting system for rapidly prototyping programming languages",
"homepage": "https://github.com/microsoft/Trieste",
"license": "MIT",
"supports": "!x86",
"dependencies": [
"cli11",
"snmalloc",
{
"name": "vcpkg-cmake",
"host": true
@ -21,6 +19,12 @@
"features": {
"parsers": {
"description": "Build the JSON and YAML parser libraries (trieste::json, trieste::yaml)"
},
"snmalloc": {
"description": "Override global new/delete with snmalloc",
"dependencies": [
"snmalloc"
]
}
}
}

View File

@ -10193,8 +10193,8 @@
"port-version": 0
},
"trieste": {
"baseline": "1.0.0",
"port-version": 1
"baseline": "1.1.0",
"port-version": 0
},
"triton": {
"baseline": "2025-02-15",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "85709e06d82ab8eef68ce5f8d3b863c22489323b",
"version": "1.1.0",
"port-version": 0
},
{
"git-tree": "25b6a9820380be0dad2bad0614fe095e3585ed90",
"version": "1.0.0",