From 3175e0e8b8a7086f72558f03dac568a697f65c06 Mon Sep 17 00:00:00 2001 From: complexlogic Date: Wed, 13 Sep 2023 18:14:44 -0700 Subject: [PATCH] Fix MSVC version --- .github/workflows/build.yml | 4 ++-- CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d393ab..a65f1b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,12 +64,12 @@ 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 index 52ed58c..2cecdd7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ include_directories(${PROJECT_BINARY_DIR}) add_compile_definitions("$<$: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 ()