Try setting CMAKE_WINDOWS_KITS_10_DIR

microsoft · Dec 11, 2024 · 206cb47 · 206cb47
1 parent 448a4ad
commit 206cb47
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 8 deletions.
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
@@ -16,8 +16,6 @@ if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic")
     set(USE_MSBUILD WINDOWS_USE_MSBUILD) # MS Build only required for dynamic builds
 endif()
 
-vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required (VERSION 3.5)")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     ${USE_MSBUILD}

diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
@@ -85,7 +85,6 @@ else()
     endif()
 endif()
 
-vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required (VERSION 3.5)")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

diff --git a/ports/libosmscout/portfile.cmake b/ports/libosmscout/portfile.cmake
@@ -15,8 +15,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
     qt5      OSMSCOUT_BUILD_MAP_QT
 )
 
-vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required (VERSION 3.5)")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     WINDOWS_USE_MSBUILD

diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake
@@ -6,8 +6,6 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "cmake_minimum_required (VERSION 3.13)" "cmake_minimum_required (VERSION 3.30)")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     WINDOWS_USE_MSBUILD

diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake
@@ -173,7 +173,6 @@ endif()
 
 set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams})
 
-vcpkg_replace_string("${SOURCE_PATH}/physx/compiler/public/CMakeLists.txt" "cmake_minimum_required (VERSION 3.7)" "cmake_minimum_required (VERSION 3.20)")
 
 # Finally invoke cmake to configure the PhysX project
 vcpkg_cmake_configure(

diff --git a/triplets/x64-win-msvc/port-customization/azure-kinect-sensor-sdk.cmake b/triplets/x64-win-msvc/port-customization/azure-kinect-sensor-sdk.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/clockutils.cmake b/triplets/x64-win-msvc/port-customization/clockutils.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/geogram.cmake b/triplets/x64-win-msvc/port-customization/geogram.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/libosmscout.cmake b/triplets/x64-win-msvc/port-customization/libosmscout.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/libspatialindex.cmake b/triplets/x64-win-msvc/port-customization/libspatialindex.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/ms-gltf.cmake b/triplets/x64-win-msvc/port-customization/ms-gltf.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/physx.cmake b/triplets/x64-win-msvc/port-customization/physx.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/restc-cpp.cmake b/triplets/x64-win-msvc/port-customization/restc-cpp.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
diff --git a/triplets/x64-win-msvc/port-customization/sltbench.cmake b/triplets/x64-win-msvc/port-customization/sltbench.cmake
@@ -0,0 +1,2 @@
+
+set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,6 @@ else() @@
         endif()
     endif()
-    vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required (VERSION 3.5)")
     vcpkg_cmake_configure(
         SOURCE_PATH "${SOURCE_PATH}"
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@

		set(ENV{CMAKE_WINDOWS_KITS_10_DIR} "$ENV{WindowsSdkDir}")