mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 10:03:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES (#8533)

Browse Source 
* Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES

to respect already set values
closes #8506

* ws change to trigger full rebuild
This commit is contained in:
Alexander Neumann 2019-12-20 21:20:31 +01:00 committed by dan-shaw
parent 386d5c9509
commit f8cfe6c164
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/buildsystems/vcpkg.cmake
View File

@ -283,7 +283,7 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
"set(_VCPKG_ROOT_DIR \"${_root_dir}\" CACHE STRING \"\")\n"
)
else()
set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
VCPKG_TARGET_TRIPLET
VCPKG_APPLOCAL_DEPS
VCPKG_CHAINLOAD_TOOLCHAIN_FILE

2
scripts/cmake/vcpkg_fixup_cmake_targets.cmake
View File

@ -179,4 +179,4 @@ function(vcpkg_fixup_cmake_targets)
endforeach()
endfunction()