diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-07 08:21:53 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-07 18:20:12 +0200 |
| commit | 78559d3b0b75270f2719ef312d2583b80f8d9325 (patch) | |
| tree | 5134f8d8691e12d68d39b6697a602a6af6d9a236 /configure.cmake | |
| parent | 790da1696930d30b6009b185dd2e247e22d4bf1b (diff) | |
Make qt-configure-module work
Check for QT_CONFIGURE_RUNNING and
- don't call find_package
- define stubs for functions that are incompatible with qt-configure-module
Change-Id: I2032302c25e1bcac6939a665cd6f136de8421acf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/configure.cmake b/configure.cmake index 808fc1b39..24898a405 100644 --- a/configure.cmake +++ b/configure.cmake @@ -2,17 +2,24 @@ #### Libraries -find_package(Ninja 1.7.2) -find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT) -find_package(Python2 2.7.5) -find_package(GPerf) -find_package(BISON) -find_package(FLEX) -find_package(Protobuf) -find_package(PkgConfig) -find_package(Snappy) -find_package(Nodejs) -find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Gui Widgets Network OpenGL OpenGLWidgets Quick Qml) +if(QT_CONFIGURE_RUNNING) + function(assertTargets) + endfunction() + function(add_check_for_support) + endfunction() +else() + find_package(Ninja 1.7.2) + find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT) + find_package(Python2 2.7.5) + find_package(GPerf) + find_package(BISON) + find_package(FLEX) + find_package(Protobuf) + find_package(PkgConfig) + find_package(Snappy) + find_package(Nodejs) + find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Gui Widgets Network OpenGL OpenGLWidgets Quick Qml) +endif() if(PkgConfig_FOUND) pkg_check_modules(DBUS dbus-1) |