1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Port the 'force_debug_info' feature

Browse Source 
This feature is read-only and is ON if CMAKE_BUILD_TYPE is RelWithDebInfo
or if that value is in CMAKE_CONFIGURATION_TYPES.
It mainly exists for the qmake support.

Change-Id: I25cb57e832dcfcab100834a104b1a3d34f01086b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-02-26 13:38:23 +01:00
parent 46a2366d12
commit b99321b78b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.cmake
View File

@ -362,6 +362,11 @@ qt_feature("debug_and_release" PUBLIC
CONDITION QT_GENERATOR_IS_MULTI_CONFIG CONDITION QT_GENERATOR_IS_MULTI_CONFIG
) )
qt_feature_config("debug_and_release" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("debug_and_release" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("force_debug_info"
LABEL "Add debug info in release mode"
AUTODETECT CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo OR RelWithDebInfo IN_LIST CMAKE_CONFIGURATION_TYPES
)
qt_feature_config("force_debug_info" QMAKE_PRIVATE_CONFIG)
qt_feature("appstore-compliant" PUBLIC qt_feature("appstore-compliant" PUBLIC
LABEL "App store compliance" LABEL "App store compliance"
PURPOSE "Disables code that is not allowed in platform app stores" PURPOSE "Disables code that is not allowed in platform app stores"

4
util/cmake/configurejson2cmake.py
View File

@ -709,7 +709,9 @@ def parseFeature(ctx, feature, data, cm_fh):
"doubleconversion": None, "doubleconversion": None,
"enable_gdb_index": None, "enable_gdb_index": None,
"enable_new_dtags": None, "enable_new_dtags": None,
"force_debug_info": None, "force_debug_info": {
"autoDetect": "CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo OR RelWithDebInfo IN_LIST CMAKE_CONFIGURATION_TYPES"
},
"framework": {"condition": "APPLE AND BUILD_SHARED_LIBS"}, "framework": {"condition": "APPLE AND BUILD_SHARED_LIBS"},
"gc_binaries": None, "gc_binaries": None,
"gcc-sysroot": None, "gcc-sysroot": None,