Skip to content

Commit

Permalink
[cdt] update to 1.3.0 (microsoft#30911)
Browse files Browse the repository at this point in the history
* update to 1.3.0

* fix boost description

* remove boost
  • Loading branch information
Adela0814 authored Apr 20, 2023
1 parent 48483c4 commit c08e90c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 36 deletions.
13 changes: 0 additions & 13 deletions ports/cdt/boost-link.patch

This file was deleted.

14 changes: 1 addition & 13 deletions ports/cdt/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO artem-ogre/CDT
REF "${VERSION}"
SHA512 811d1fede4960808954bc17f37c8639f52800c98562e9283517c666735ddf3b2f2f8a57992669899be13c40b0fc4439d3cd1a101cb596d2335ef4fc307408c63
SHA512 cffccb96d8cb13e7cb2edf9e105e5ee193ec1c3f2872ee5fba7a47758d9651e1b0f02af9122b840e90a07a4b9f3773c30ac9b11b966741301c853429d49c0627
HEAD_REF master
PATCHES
boost-link.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"64-bit-index-type" CDT_USE_64_BIT_INDEX_TYPE
"as-compiled-library" CDT_USE_AS_COMPILED_LIBRARY
"boost" CDT_USE_BOOST
)

if (NOT CDT_USE_AS_COMPILED_LIBRARY)
Expand All @@ -28,15 +25,6 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH cmake)

if(CDT_USE_BOOST)
set(CDT_USE_BOOST_STR "#if 1")
else()
set(CDT_USE_BOOST_STR "#if 0")
endif()
foreach(FILE CDTUtils.h Triangulation.hpp)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${FILE}" "#ifdef CDT_USE_BOOST" "${CDT_USE_BOOST_STR}")
endforeach()

if (CDT_USE_AS_COMPILED_LIBRARY)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
endif()
Expand Down
9 changes: 1 addition & 8 deletions ports/cdt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "cdt",
"version": "1.2.0",
"port-version": 1,
"version": "1.3.0",
"description": "Constrained Delaunay Triangulation",
"homepage": "https://github.com/artem-ogre/CDT.git",
"license": "MPL-2.0",
Expand All @@ -21,12 +20,6 @@
},
"as-compiled-library": {
"description": "Templates for float and double will be instantiated and compiled into a library"
},
"boost": {
"description": "Boost is used as a fall-back for features missing in C++98 and performance tweaks",
"dependencies": [
"boost-container"
]
}
}
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1413,8 +1413,8 @@
"port-version": 5
},
"cdt": {
"baseline": "1.2.0",
"port-version": 1
"baseline": "1.3.0",
"port-version": 0
},
"celero": {
"baseline": "2.8.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cdt.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2455f0f823d6e0f87540a29206f2779004aedce0",
"version": "1.3.0",
"port-version": 0
},
{
"git-tree": "ddc92ab3ef284f9643001138f8ed320a2417a80f",
"version": "1.2.0",
Expand Down

0 comments on commit c08e90c

Please sign in to comment.