diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-02-19 08:19:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 23:19:20 -0800 |
| commit | 447b9cbe8c2a5a62da19943c48beb798ccae2354 (patch) | |
| tree | 586282ea7472ee9d123d3d4eba7452f2869e5f9d /scripts | |
| parent | 3ae84754fa6d0158cb4fdc0d215160f63f69cc9a (diff) | |
| download | vcpkg-447b9cbe8c2a5a62da19943c48beb798ccae2354.tar.gz vcpkg-447b9cbe8c2a5a62da19943c48beb798ccae2354.zip | |
[vcpkg] fix script broken audit (#16293)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ef7a7a54d..e135d39ac 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -468,19 +468,16 @@ if(NOT Z_VCPKG_ROOT_DIR) z_vcpkg_add_fatal_error("Could not find .vcpkg-root") endif() -# NOTE: _VCPKG_INSTALLED_DIR cannot be removed without tool changes. -if(NOT DEFINED VCPKG_INSTALLED_DIR) - if(DEFINED _VCPKG_INSTALLED_DIR) - set(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}") - elseif(VCPKG_MANIFEST_MODE) - set(VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed") +if(NOT DEFINED _VCPKG_INSTALLED_DIR) + if(VCPKG_MANIFEST_MODE) + set(_VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed") else() - set(VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed") + set(_VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed") endif() -endif() -set(VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" +set(_VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}" CACHE PATH "The directory which contains the installed libraries for each triplet" FORCE) +endif() if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. list(APPEND CMAKE_PREFIX_PATH |