[directxtex] update port with omp feature (microsoft#30944)

* [directxtex] update port with omp feature * Update baseline * Flip feature to no-omp * Update baseline
SokaDance · Apr 22, 2023 · fbdc88f · fbdc88f
1 parent f35bb44
commit fbdc88f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
@@ -18,6 +18,8 @@ vcpkg_check_features(
         openexr ENABLE_OPENEXR_SUPPORT
         spectre ENABLE_SPECTRE_MITIGATION
         tools BUILD_TOOLS
+    INVERTED_FEATURES
+        no-omp BC_USE_OPENMP
 )
 
 if(VCPKG_TARGET_IS_MINGW AND ("dx11" IN_LIST FEATURES))
@@ -30,7 +32,7 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${FEATURE_OPTIONS} -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF -DBC_USE_OPENMP=ON
+    OPTIONS ${FEATURE_OPTIONS} -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()

diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "directxtex",
   "version-date": "2023-03-30",
+  "port-version": 1,
   "description": "DirectXTex texture processing library",
   "homepage": "https://github.com/Microsoft/DirectXTex",
   "documentation": "https://github.com/microsoft/DirectXTex/wiki",
@@ -35,6 +36,9 @@
     "dx12": {
       "description": "Build with DirectX12 support for Windows 10/Windows 11"
     },
+    "no-omp": {
+      "description": "Build without using OpenMP support for the BC6H/BC7 software codec"
+    },
     "openexr": {
       "description": "Enable OpenEXR support",
       "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2078,7 +2078,7 @@
     },
     "directxtex": {
       "baseline": "2023-03-30",
-      "port-version": 0
+      "port-version": 1
     },
     "directxtk": {
       "baseline": "2023-03-30",

diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "14daf71a3dffda45222d771968e399ec56e1c0e1",
+      "version-date": "2023-03-30",
+      "port-version": 1
+    },
     {
       "git-tree": "49ac22c74d82cd2a67dc98755d3bd78d1ff3be45",
       "version-date": "2023-03-30",