Przeglądaj źródła

cmake: Default to modern CMake build system for Windows

PatTheMav 1 rok temu
rodzic
commit
2f1379aa64
2 zmienionych plików z 1 dodań i 2 usunięć
  1. 1 1
      CMakeLists.txt
  2. 0 1
      CMakePresets.json

+ 1 - 1
CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22...3.25)
 cmake_minimum_required(VERSION 3.22...3.25)
 
 
-if(CMAKE_HOST_SYSTEM_NAME MATCHES "(Darwin)" OR OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "(Windows|Darwin)" OR OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
   include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
   include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
 
 
   project(obs-studio VERSION ${OBS_VERSION_CANONICAL})
   project(obs-studio VERSION ${OBS_VERSION_CANONICAL})

+ 0 - 1
CMakePresets.json

@@ -102,7 +102,6 @@
       "binaryDir": "${sourceDir}/build_x64",
       "binaryDir": "${sourceDir}/build_x64",
       "generator": "Visual Studio 17 2022",
       "generator": "Visual Studio 17 2022",
       "cacheVariables": {
       "cacheVariables": {
-        "OBS_CMAKE_VERSION": {"type": "STRING", "value": "3.0.0"},
         "GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
         "GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
         "VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
         "VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
         "ENABLE_BROWSER": true,
         "ENABLE_BROWSER": true,