3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 20:44:45 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] fix script broken audit (#16293)

Browse Source
This commit is contained in:
Stefano Sinigardi 2021-02-19 08:19:20 +01:00 committed by GitHub
parent 3ae84754fa
commit 447b9cbe8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/buildsystems/vcpkg.cmake
View File

@ -468,19 +468,16 @@ if(NOT Z_VCPKG_ROOT_DIR)
z_vcpkg_add_fatal_error("Could not find .vcpkg-root") z_vcpkg_add_fatal_error("Could not find .vcpkg-root")
endif() endif()
# NOTE: _VCPKG_INSTALLED_DIR cannot be removed without tool changes. if(NOT DEFINED _VCPKG_INSTALLED_DIR)
if(NOT DEFINED VCPKG_INSTALLED_DIR) if(VCPKG_MANIFEST_MODE)
if(DEFINED _VCPKG_INSTALLED_DIR) set(_VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed")
set(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}")
elseif(VCPKG_MANIFEST_MODE)
set(VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed")
else() else()
set(VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed") set(_VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed")
endif() endif()
endif() set(_VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}"
set(VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}"
CACHE PATH CACHE PATH
"The directory which contains the installed libraries for each triplet" FORCE) "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. 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 list(APPEND CMAKE_PREFIX_PATH