[vcpkg.cmake] Setup CMAKE_PROGRAM_PATH for the host if possible #23322
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
I was considering a similar change but the lack of a satisfying response to #17607 held me back. All problems are still valid. In particular, and not resolved with this PR:
|
fixed. using
in this case the port can pass it by hand. There are probably only a handfull of ports really needing that (<10 ports) |
This reverts commit 17737bc.
Cheney-W
added
the
category:tool-update
| if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}") | ||
| list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") | ||
| option(VCPKG_SETUP_CMAKE_PROGRAM_PATH "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) | ||
| cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "NOT VCPKG_HOST_TRIPLET STREQUAL \"\"" OFF) |
There was a problem hiding this comment.
CMake Warning (dev) at F:/vcpkg/downloads/tools/cmake-3.22.2-windows/cmake-3.22.2-windows-i386/share/cmake-3.22/Modules/CMakeDependentOption.cmake:84 (message):
Policy CMP0127 is not set: cmake_dependent_option() supports full Condition
Syntax. Run "cmake --help-policy CMP0127" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.
Call Stack (most recent call first):
F:/vcpkg/scripts/buildsystems/vcpkg.cmake:521 (cmake_dependent_option)
F:/vcpkg/buildtrees/libwebsockets/x64-windows-rel/CMakeFiles/3.22.2/CMakeSystem.cmake:6 (include)
F:/vcpkg/buildtrees/libwebsockets/x64-windows-rel/CMakeFiles/CMakeTmp/CMakeLists.txt:5 (project)
This warning is for project developers. Use -Wno-dev to suppress it.
There was a problem hiding this comment.
@JackBoosY @Neumann-A - I'm seeing the same warning about CMP0127 in our project. I'm using CMake version 3.23.1. Because vcpkg.cmake is wrapped in a cmake_policy push/pop, I can't set a policy outside of the file as it doesn't have any effect
It seems like the best option is to place a call to cmake_policy(SET CMP0127 NEW) just before the call to cmake_dependent_option. Does that seem like a reasonable fix? If so, I can prepare the change. Thanks!
There was a problem hiding this comment.
I've created an issue to track this here #25985.
| if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) | ||
| set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") | ||
| if(VCPKG_USE_HOST_TOOLS) | ||
| set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") |
There was a problem hiding this comment.
VCPKG_HOST_TRIPLET maybe empty here.
See #23395.
| file(GLOB_RECURSE Z_VCPKG_TOOLS_DIRS "${tools_base_path}/*") | ||
| file(GLOB_RECURSE Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") | ||
| list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES}) |
There was a problem hiding this comment.
I can confirm that changing GLOB_RECURSE to GLOB will fix the problem of Z_VCPKG_TOOLS_DIRS being empty when the base path has folders. Is it a cmake bug?
In most useful cases
CMAKE_PROGRAM_PATHneeds to be setup for the host not the target.This PR sets it up for the host by default but also allows deactivating vcpkg setup completely or using the current setup.
This avoids hacks like: 4d6220f where
CMAKE_PROGRAM_PATHis adjusted before vcpkg to actually be able to find host pkgconf and run it in the configure script.