diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2023-10-17 17:15:26 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2023-10-19 18:55:17 +0000 |
| commit | a071d4354a4efc732239a25f584afac8fb3c6eee (patch) | |
| tree | 9b33c4f2b8b687994a053551761bd96b9f44f225 | |
| parent | cdc785757276457125524ceff6578d47d4186cb3 (diff) | |
CMakePM: Save CMAKE_MODULE|PREFIX_PATH in cache for vcpkg
This would allow the user to see the paths set by vcpkg.
Change-Id: I6d4ed9a9c69c2296851c8f8363b78d5adb7d2723
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/share/3rdparty/package-manager/auto-setup.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index 00948cb967..bae90ee642 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -226,6 +226,14 @@ macro(qtc_auto_setup_vcpkg) endif() set(CMAKE_TOOLCHAIN_FILE "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake" CACHE PATH "" FORCE) + + # Save CMAKE_PREFIX_PATH and CMAKE_MODULE_PATH as cache variables + if (CMAKE_VERSION GREATER_EQUAL "3.19") + cmake_language(DEFER CALL list REMOVE_DUPLICATES CMAKE_PREFIX_PATH) + cmake_language(DEFER CALL list REMOVE_DUPLICATES CMAKE_MODULE_PATH) + cmake_language(DEFER CALL set CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}" CACHE STRING "" FORCE) + cmake_language(DEFER CALL set CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE STRING "" FORCE) + endif() endif() endmacro() qtc_auto_setup_vcpkg() |