diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-09 12:28:14 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-09 13:56:38 +0100 |
| commit | 41d948c50b24e82e1e0065dc344349cb3503895f (patch) | |
| tree | a494d19a710230c0100b9880bee0f254cd3be3fc /cmake/QtSetup.cmake | |
| parent | 9bade12c2ca78a2dc5effda568342ae11adb0f42 (diff) | |
CMake: Fix configure -developer-build
Configure now translates -developer-build to INPUT_developer_build
without setting FEATURE_developer_build.
The install prefix determination code in QtSetup.cmake happens much
earlier than the feature evaluation. As the developer_build feature is
merely a switch that's supposed to be flipped by the user, we can just
translate the INPUT_developer_build value to FEATURE_developer_build in
QtSetup.cmake.
Fixes: QTBUG-88318
Change-Id: I57918232359e2e367e41b779d3f4737731dd76e5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtSetup.cmake')
| -rw-r--r-- | cmake/QtSetup.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 7a86b29037..5337856a33 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -54,6 +54,12 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Do not relink dependent libraries when no header has changed: set(CMAKE_LINK_DEPENDS_NO_SHARED ON) +# Pre-calculate the developer_build feature if it's set by the user via INPUT_developer_build +if(NOT FEATURE_developer_build AND INPUT_developer_build + AND NOT "${INPUT_developer_build}" STREQUAL "undefined") + set(FEATURE_developer_build ON) +endif() + # Detect non-prefix builds: either when the qtbase install prefix is set to the binary dir # or when a developer build is explicitly enabled and no install prefix is specified. # This detection only happens when building qtbase, and later is propagated via the generated |