diff options
| author | Chris Townsend <townsend2010@users.noreply.github.com> | 2021-03-08 15:44:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 12:44:32 -0800 |
| commit | 0dc27b9b672cb9d069cf58c48f3ae3f7395d108b (patch) | |
| tree | a069d44f3008c3d288a127fecf97a8c8e55b2475 /scripts | |
| parent | c47216ac7904b09187c119c7e4d010dcf993e3d5 (diff) | |
| download | vcpkg-0dc27b9b672cb9d069cf58c48f3ae3f7395d108b.tar.gz vcpkg-0dc27b9b672cb9d069cf58c48f3ae3f7395d108b.zip | |
[vcpkg-cmake] Search for binaries after manifest-based installs (#16605)
Otherwise, find_package() fails to find any binaries for many manifest installed packages until a second cmake run commences.
Fixes #16604
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e135d39ac..c830644e9 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -546,15 +546,6 @@ set(CMAKE_SYSTEM_IGNORE_PATH "C:/OpenSSL-Win64/lib/VC/static" ) -list(APPEND CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") -file(GLOB Z_VCPKG_TOOLS_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*") -foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) - if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}") - list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") - endif() -endforeach() - - # CMAKE_EXECUTABLE_SUFFIX is not yet defined if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") set(Z_VCPKG_EXECUTABLE "${Z_VCPKG_ROOT_DIR}/vcpkg.exe") @@ -655,6 +646,14 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C endif() endif() +list(APPEND CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") +file(GLOB Z_VCPKG_TOOLS_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*") +foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) + if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}") + list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") + endif() +endforeach() + function(add_executable) z_vcpkg_function_arguments(ARGS) _add_executable(${ARGS}) |