diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2023-10-17 16:01:45 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2023-10-19 18:55:00 +0000 |
| commit | b5d0c5dd36078a9499c494c0429107c5171e5189 (patch) | |
| tree | bd3c8736b7cfc1077408a9297b860b951d527be7 | |
| parent | eccbff7698557ff4706ab21890b4fb044ff3a9c1 (diff) | |
CMakePM: Save CMAKE_PREFIX|MODULE_PATH as cache variables for conan
This way it's visible in the project settings where the Conan paths are
added.
Change-Id: I95aa59c836bf3b9ed122e9bffdd61b0dd3c7354e
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index f6e6ce129a..00948cb967 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -119,6 +119,10 @@ macro(qtc_auto_setup_conan) file(WRITE \"${CMAKE_BINARY_DIR}/conan-dependencies/conan_paths.cmake\" \" list(PREPEND CMAKE_PREFIX_PATH \\\"\${CONAN_GENERATORS_FOLDER}\\\") list(PREPEND CMAKE_MODULE_PATH \\\"\${CONAN_GENERATORS_FOLDER}\\\") + list(REMOVE_DUPLICATES CMAKE_PREFIX_PATH) + list(REMOVE_DUPLICATES CMAKE_MODULE_PATH) + set(CMAKE_PREFIX_PATH \\\"\\\${CMAKE_PREFIX_PATH}\\\" CACHE STRING \\\"\\\" FORCE) + set(CMAKE_MODULE_PATH \\\"\\\${CMAKE_MODULE_PATH}\\\" CACHE STRING \\\"\\\" FORCE) \") endif() else() |