[cdt] Fix boost feature

microsoft · Feb 15, 2023 · 11da2f0 · 11da2f0
1 parent 6ceb000
commit 11da2f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/ports/cdt/portfile.cmake b/ports/cdt/portfile.cmake
@@ -26,6 +26,15 @@ 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()

diff --git a/ports/cdt/vcpkg.json b/ports/cdt/vcpkg.json
@@ -22,7 +22,10 @@
       "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"
+      "description": "Boost is used as a fall-back for features missing in C++98 and performance tweaks",
+      "dependencies": [
+        "boost-container"
+      ]
     }
   }
 }
diff --git a/versions/c-/cdt.json b/versions/c-/cdt.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "6c5e64273872865966ab48229f73fe9b69be0dc1",
+      "git-tree": "002b5841cd0600e2104188e9c6d2f27b74caab1a",
       "version": "1.2.0",
       "port-version": 0
     }