From c5006107b98b9e1697fbc3a13c26fe22e606e468 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 11 Jun 2024 23:13:28 +0300 Subject: [PATCH] update windows workflow --- .github/workflows/windows.yml | 5 +++-- CMakeLists.txt | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 46fe7122..ece6c911 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,6 +23,7 @@ jobs: - name: Set up vcpkg run: | + set VCPKG_DEFAULT_HOST_TRIPLET=x64-windows-static-md git clone https://github.com/microsoft/vcpkg.git cd vcpkg .\bootstrap-vcpkg.bat @@ -32,9 +33,9 @@ jobs: run: | mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON .. + cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static-md .. Remove-Item -Path CMakeFiles -Recurse -Force - cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON .. + cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static-md .. cmake --build . --config Release - name: Package for Windows run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 09d19928..11a01b7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,6 @@ if(MSVC) set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE) endif() if((CMAKE_BUILD_TYPE EQUAL "Release") OR (CMAKE_BUILD_TYPE EQUAL "RelWithDebInfo")) - set(VCPKG_TARGET_TRIPLET "x64-windows-static-md") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Release>") target_compile_options(${PROJECT_NAME} PRIVATE /W4 /MT /O2) else()