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

CMake: Port the 'debug' feature

Browse Source 
This feature is read-only and supposed to be set by variables like
CMAKE_BUILD_TYPE. It mainly exists for the qmake support.

Change-Id: Ic7e32cbda0f3c2d92dd446b07a3bf1a8d85ec3b9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-02-26 12:53:30 +01:00
parent a0ffdf765e
commit becbd07f55
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.cmake
View File

@ -344,6 +344,11 @@ qt_feature_definition("developer-build" "QT_BUILD_INTERNAL")
qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG
NAME "private_tests" NAME "private_tests"
) )
qt_feature("debug"
LABEL "Build for debugging"
AUTODETECT QT_FEATURE_developer_build OR ( WIN32 AND NOT GCC ) OR APPLE
CONDITION Debug STREQUAL CMAKE_BUILD_TYPE OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES
)
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"

2
util/cmake/configurejson2cmake.py
View File

@ -701,7 +701,7 @@ def parseFeature(ctx, feature, data, cm_fh):
"compiler-flags": None, "compiler-flags": None,
"cross_compile": None, "cross_compile": None,
"debug_and_release": None, "debug_and_release": None,
"debug": None, "debug": {"condition": "Debug STREQUAL CMAKE_BUILD_TYPE OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES"},
"dlopen": {"condition": "UNIX"}, "dlopen": {"condition": "UNIX"},
"doubleconversion": None, "doubleconversion": None,
"enable_gdb_index": None, "enable_gdb_index": None,