Fix MSVC version

complexlogic · Sep 14, 2023 · ef73a5a · ef73a5a
1 parent 99c7e75
commit ef73a5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,12 +64,11 @@ jobs:
 
       - name: Configure
         run: cmake -S . -B build 
-               -G "${{env.CMAKE_GENERATOR}}" 
+               -G "${{env.CMAKE_GENERATOR}}" -T v143,version=14.37
                -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
                -DVCPKG_OVERLAY_PORTS=build/overlays/ports
                -DVCPKG_OVERLAY_TRIPLETS=config/vcpkg_triplets
                -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TRIPLET}}
-               -DCMAKE_VS_PLATFORM_TOOLSET_VERSION=14.37
 
       - name: Build
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(${PROJECT_BINARY_DIR})
 add_compile_definitions("$<$<CONFIG:DEBUG>:DEBUG>")
 if (WIN32)
   set (USE_STD_FORMAT true)
-  if (MSVC_VERSION AND MSVC_VERSION VERSION_LESS 17.7)
+  if (MSVC_VERSION AND MSVC_VERSION VERSION_LESS 1937)
     message(FATAL_ERROR "Visual Studio 17.7 and later supported only")
   endif ()
 endif ()