[openvdb] use support expressions (#33747)

microsoft · Sep 13, 2023 · f63ea3c · f63ea3c
1 parent b8ef3f5
commit f63ea3c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake
@@ -19,25 +19,16 @@ vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         "tools" OPENVDB_BUILD_TOOLS
+        "ax"    OPENVDB_BUILD_AX
 )
 
-
-if ("ax" IN_LIST FEATURES)
-  if(NOT VCPKG_TARGET_IS_WINDOWS)
-    set(OPENVDB_BUILD_AX ON)
-  else()
-    message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.")  
-  endif()
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DOPENVDB_BUILD_UNITTESTS=OFF
         -DOPENVDB_BUILD_PYTHON_MODULE=OFF
-        -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+        -DOPENVDB_3_ABI_COMPATIBLE=OFF
         -DUSE_EXR=ON
-        -DUSE_GLFW3=ON
         -DUSE_IMATH_HALF=ON
         -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
         -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
@@ -46,7 +37,7 @@ vcpkg_cmake_configure(
         -DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS}
         -DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS}
         -DUSE_PKGCONFIG=OFF
-        ${OPENVDB_BUILD_AX}
+        -DOPENVDB_BUILD_AX=${OPENVDB_BUILD_AX}
 )
 
 vcpkg_cmake_install()

diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openvdb",
   "version": "10.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Sparse volume data structure and tools",
   "homepage": "https://github.com/dreamworksanimation/openvdb",
   "license": "MPL-2.0",
@@ -30,7 +30,14 @@
   ],
   "features": {
     "ax": {
-      "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data."
+      "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data.",
+      "supports": "!windows",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false
+        }
+      ]
     },
     "tools": {
       "description": "OpenVDB utilities: view, print and render",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6154,7 +6154,7 @@
     },
     "openvdb": {
       "baseline": "10.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "openvino": {
       "baseline": "2023-06-11",

diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34b77a62946c569224d4aacc863e8ba9d7aea31f",
+      "version": "10.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "dc6551f1e86bf8c86ce9fd0133e6e979f3729faa",
       "version": "10.0.0",