diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-07-11 14:58:50 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-07-12 11:24:15 +0200 |
| commit | 70fc6b4581f9df59cf05c158e60d0343b69c2d57 (patch) | |
| tree | 21d9c7dfcd9c7956264d0edf904a05748bf44ad4 | |
| parent | 25f5983ea8f53aca24eae1cc57a6070c7d07aa67 (diff) | |
Disable vcpkg detection/integration by default
We should not automatically enable vcpkg as soon as we find it on the
system. With this change, we disable the automatic
detection/integration.
[ChangeLog][configure] Vcpkg detection/integration is now disabled by
default, and it can be enabled by either passing `-vcpkg` to the
configure script, or by passing `-DQT_USE_VCPKG=ON` to cmake.
Change-Id: I4f098db670f11373064c071f1c3204e2e183d3db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 2 | ||||
| -rw-r--r-- | cmake/configure-cmake-mapping.md | 2 | ||||
| -rw-r--r-- | config_help.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 012b3bbb74..bae271eeab 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -9,7 +9,7 @@ # done when initially configuring qtbase. # This needs to be here because QtAutoDetect loads before any other modules -option(QT_USE_VCPKG "Enable the use of vcpkg" ON) +option(QT_USE_VCPKG "Enable the use of vcpkg" OFF) function(qt_internal_ensure_static_qt_config) if(NOT DEFINED BUILD_SHARED_LIBS) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index b8eb8ddbfa..0ce347b5f5 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -76,7 +76,7 @@ The following table describes the mapping of configure options to CMake argument | -unity-build-batch-size <int> | -DQT_UNITY_BUILD_BATCH_SIZE=<int> | | | -warnings-are-errors | -DWARNINGS_ARE_ERRORS=ON | | | -no-pkg-config | -DFEATURE_pkg_config=OFF | | -| -no-vcpkg | -DQT_USE_VCPKG=OFF | | +| -vcpkg | -DQT_USE_VCPKG=ON | | | -D <string> | -DQT_EXTRA_DEFINES=<string1>;<string2> | | | -I <string> | -DQT_EXTRA_INCLUDEPATHS=<string1>;<string2> | | | -L <string> | -DQT_EXTRA_LIBDIRS=<string1>;<string2> | | diff --git a/config_help.txt b/config_help.txt index 6b54608a96..9c9f8f7c62 100644 --- a/config_help.txt +++ b/config_help.txt @@ -162,7 +162,7 @@ Build environment: -pkg-config .......... Use pkg-config [auto] (Unix only) - -vcpkg ............... Use vcpkg [yes] + -vcpkg ............... Use vcpkg [no] -D <string> .......... Pass additional preprocessor define -I <string> .......... Pass additional include path |