Get CMake and vcpkg working again on my local machine

vegastrike · Sep 18, 2021 · 1fe0a81 · 1fe0a81
1 parent 184f474
commit 1fe0a81
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -52,7 +52,7 @@ IF (POLICY CMP0048)
     CMAKE_POLICY (SET CMP0048 NEW)
 ENDIF (POLICY CMP0048)
 
-# Very important. Without this, CMake can't find pow() -- at least not on my Windows machine.
+# Used to be that without this, CMake couldn't find pow() -- at least not on my Windows machine.
 IF (POLICY CMP0066)
     CMAKE_POLICY (SET CMP0066 NEW)  #OLD
 ENDIF ()
@@ -73,8 +73,6 @@ IF (POLICY CMP0091)
     CMAKE_POLICY (SET CMP0091 NEW)
 ENDIF ()
 
-SET (VCPKG_INSTALL_OPTIONS "-DCMAKE_SYSTEM_VERSION='10.0.19041.0' -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION='10.0.19041.0' -DVCPKG_CMAKE_SYSTEM_VERSION='10.0.19041.0' -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION='10.0.19041.0'")
-
 PROJECT(Vega_Strike
     VERSION
         "${VEGASTRIKE_VERSION_MAJOR}.${VEGASTRIKE_VERSION_MINOR}.${VEGASTRIKE_VERSION_PATCH}"   #.${VEGASTRIKE_VERSION_TWEAK}   # CMake only allows numeric version components, unfortunately.

diff --git a/engine/vcpkg.json b/engine/vcpkg.json
@@ -2,7 +2,6 @@
     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
     "name": "vega-strike",
     "version-string": "0.9.0",
-    "overrides": [],
     "dependencies": [
         "boost-python",
         "boost-log",