diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-08-19 17:28:15 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-08-20 12:40:37 +0000 |
| commit | 19fded6a6a381e71ae596e538b5d4941b8153501 (patch) | |
| tree | 0df05647b4f21a7bd7ab00c1e3629172d8d86db0 /src/share | |
| parent | 2e77362da08feea3d38991f17e57711acb409520 (diff) | |
CMakePM: Add variables to skip Qt Creator's package manager to cache
This way you will get the variables in the variables list and you only
need to change them from OFF to ON.
This won't fix the tasks below, but it will remove the lookup of the
special variable names.
Task-number: QTCREATORBUG-25680
Task-number: QTCREATORBUG-25891
Task-number: QTCREATORBUG-25972
Change-Id: I8ed1d5c4275516b10f4f10ad63b3de0f6b2ffbc8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/share')
| -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 ba25ae5667..50519f30af 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -14,6 +14,7 @@ endif() if (QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP) return() endif() +option(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP "Skip Qt Creator's package manager auto-setup" OFF) # # conan @@ -27,6 +28,7 @@ foreach(file conanfile.txt conanfile.py) endforeach() if (conanfile_txt AND NOT QT_CREATOR_SKIP_CONAN_SETUP) + option(QT_CREATOR_SKIP_CONAN_SETUP "Skip Qt Creator's conan package manager auto-setup" OFF) # Get conan from Qt SDK set(qt_creator_ini "${CMAKE_CURRENT_LIST_DIR}/../QtProject/QtCreator.ini") @@ -108,6 +110,8 @@ unset(conanfile_txt) # if (EXISTS "${CMAKE_SOURCE_DIR}/vcpkg.json" AND NOT QT_CREATOR_SKIP_VCPKG_SETUP) + option(QT_CREATOR_SKIP_VCPKG_SETUP "Skip Qt Creator's vcpkg package manager auto-setup" OFF) + find_program(vcpkg_program vcpkg) if (NOT vcpkg_program) return() |