mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 23:29:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Only set GENERATOR_INSTANCE if supprted by generator

Browse Source
This commit is contained in:
Alexander Neumann 2024-11-22 08:23:18 +01:00 committed by GitHub
parent b4bc90fdcb
commit 0a720418c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
triplets/x64-win-msvc/x64-win-msvc-toolchain.cmake
View File

@ -28,7 +28,9 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
endblock() endblock()
endif() endif()
if(CMAKE_GENERATOR MATCHES "Visual Studio")
set(CMAKE_GENERATOR_INSTANCE "$ENV{VSINSTALLDIR}") set(CMAKE_GENERATOR_INSTANCE "$ENV{VSINSTALLDIR}")
endif()
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "")
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "") set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "")