diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-29 17:31:29 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-04-20 16:44:29 +0300 |
| commit | e2d208747393ddde1f5f73901de32cdd9f45a445 (patch) | |
| tree | bbee256bc8f1c6623453af0d3f82fb5f481459a0 /src/render | |
| parent | f54784825e18ca20b988361f1eb8e64304b05cac (diff) | |
Fix error when calling configure/qt-configure-module
Commit 9a473a3c9b246f4895ae73d7060745b8b199a6c5 introduced a
find_package call in a configure.cmake file, very subtly breaking
top-level builds with configure or calls to qt-configure-module for
qt3d.
The find_package call results in errors of the cmake call that runs
QtProcessConfigureArgs.cmake (see bug report for details).
Guard the find_package call by checking QT_CONFIGURE_RUNNING.
Fixes: QTBUG-92163
Change-Id: Ib192bbfce6fb9a1cc3b65dd7824f76db3a99aa43
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bf5d1fe5422d3740985be2eacb35f3e971f2a39d)
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/configure.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/render/configure.cmake b/src/render/configure.cmake index b1f604d22..6aa29b5d4 100644 --- a/src/render/configure.cmake +++ b/src/render/configure.cmake @@ -6,7 +6,9 @@ #### Libraries -find_package(Vulkan) +if(NOT QT_CONFIGURE_RUNNING) + find_package(Vulkan) +endif() #### Tests |