diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-12-20 21:20:31 +0100 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-20 12:20:31 -0800 |
| commit | f8cfe6c16462941cfd53b3db9e47e4955e1c1789 (patch) | |
| tree | fc720b2a258516e04e0df04eb8ef4ead9a44bb9e /scripts | |
| parent | 386d5c9509e0be812af4178461817dae0e48be4f (diff) | |
| download | vcpkg-f8cfe6c16462941cfd53b3db9e47e4955e1c1789.tar.gz vcpkg-f8cfe6c16462941cfd53b3db9e47e4955e1c1789.zip | |
Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES (#8533)
* Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
to respect already set values
closes #8506
* ws change to trigger full rebuild
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ed9bcbc69..87a206eb1 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -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 diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index c383fcb56..a042d9124 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -179,4 +179,4 @@ function(vcpkg_fixup_cmake_targets) endforeach() endfunction() - + |