diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-01-11 13:35:10 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-01-13 14:38:16 +0100 |
| commit | 4e4cd7416af3f84e6a7c7dee03a2e50864e9cacc (patch) | |
| tree | 7c040dd953d882c2153b85c69de85357eb9d75c7 /src/tools/syncqt/CMakeLists.txt | |
| parent | 0e3ef4111271761ede6cbbeb3b0fa075a483085e (diff) | |
Add the 'QT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG' flag
The flag avoids overriding of the default CMake build config when
building syncqt.
Add extra checks to the make sure that configure-time tools use the
correct build type.
Fixes: QTBUG-109792
Pick-to: 6.5
Change-Id: I572fed60c58e59297fa559aea6eb86af94b979b7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/tools/syncqt/CMakeLists.txt')
| -rw-r--r-- | src/tools/syncqt/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/syncqt/CMakeLists.txt b/src/tools/syncqt/CMakeLists.txt index 5349e69213..3740b1bd4d 100644 --- a/src/tools/syncqt/CMakeLists.txt +++ b/src/tools/syncqt/CMakeLists.txt @@ -11,6 +11,11 @@ set(compile_definitions QT_NAMESPACE="${QT_NAMESPACE}" ) +set(config_type "") +if(NOT QT_INTERNAL_AVOID_OVERRIDING_SYNCQT_CONFIG) + set(config_type CONFIG RelWithDebInfo) +endif() + if(CMAKE_OSX_ARCHITECTURES) set(osx_architectures "-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}") endif() @@ -30,5 +35,5 @@ qt_internal_add_configure_time_tool(${target_name} "${osx_architectures}" SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp" - CONFIG RelWithDebInfo + ${config_type} ) |