[Openturns] burn in linkage and fix deps (microsoft#37234)

m-kuhn · Mar 12, 2024 · accfd32 · accfd32
1 parent 919fd8d
commit accfd32
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/ports/openturns/fix-dep.patch b/ports/openturns/fix-dep.patch
@@ -0,0 +1,23 @@
+diff --git a/lib/OpenTURNSConfig.cmake.in b/lib/OpenTURNSConfig.cmake.in
+index 1247591893..c12e423892 100644
+--- a/lib/OpenTURNSConfig.cmake.in
++++ b/lib/OpenTURNSConfig.cmake.in
+@@ -74,6 +74,17 @@ if ("1" STREQUAL "@HMAT_FOUND@")
+   find_package (HMAT REQUIRED NO_MODULE PATHS ${HMAT_DIR} NO_DEFAULT_PATH)
+ endif ()
+
++include(CMakeFindDependencyMacro)
++find_dependency(Eigen3 CONFIG)
++find_dependency(TBB CONFIG)
++find_dependency(Spectra)
++find_dependency(NLopt)
++find_dependency(dlib)
++find_dependency(HDF5)
++find_dependency(Ceres CONFIG)
++find_dependency(Pagmo CONFIG)
++find_dependency(CMinpack CONFIG)
++
+ # Our library dependencies (contains definitions for IMPORTED targets)
+ include("${CMAKE_CURRENT_LIST_DIR}/OpenTURNS-Targets.cmake")
+
+
diff --git a/ports/openturns/portfile.cmake b/ports/openturns/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
       link-gmp.patch
       reorder-mpc.patch
+      fix-dep.patch
 )
 
 vcpkg_find_acquire_program(FLEX)
@@ -51,6 +52,11 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenTURNSConfig.cmake" "/lib/cmake/" "/share/")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenTURNSConfig.cmake" "/lib" "$<$<CONFIG:DEBUG>:/debug>/lib")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openturns/OTdebug.h" "#ifndef OT_STATIC" "#if 0")
+else()
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openturns/OTdebug.h" "#ifndef OT_STATIC" "#if 1")
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/openturns/vcpkg.json b/ports/openturns/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openturns",
   "version": "1.20",
-  "port-version": 1,
+  "port-version": 2,
   "description": "OpenTURNS is a scientific C++ and Python library featuring an internal data model and algorithms dedicated to the treatment of uncertainties.",
   "homepage": "http://www.openturns.org",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6494,7 +6494,7 @@
     },
     "openturns": {
       "baseline": "1.20",
-      "port-version": 1
+      "port-version": 2
     },
     "openvdb": {
       "baseline": "11.0.0",

diff --git a/versions/o-/openturns.json b/versions/o-/openturns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "55e0a233063acabd3fe365687fda3f99d6e79f4c",
+      "version": "1.20",
+      "port-version": 2
+    },
     {
       "git-tree": "1533ede792f48bee5c53f35de06c493e6ed0ab0a",
       "version": "1.20",