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

cmake: Replace - with _ in define module names

Browse Source 
Otherwise when compiling qxcb-glx-integration we would get a warning like
   <command-line>: warning: ISO C++11 requires whitespace after the macro name
because -DQT_BUILD_QXCB-GLX-INTEGRATION_LIB is not a valid define name

Change-Id: Ie8cef93a47b14d75eaad77893f7182e1514dd616
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Albert Astals Cid 2019-06-05 11:31:55 +02:00
parent 38cd18384f
commit eda3421111
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/QtBuild.cmake
View File

@ -329,7 +329,7 @@ QT.${module_lower}.bins = $$QT_MODULE_BIN_BASE
QT.${module_lower}.depends = QT.${module_lower}.depends =
QT.${module_lower}.uses = QT.${module_lower}.uses =
QT.${module_lower}.module_config = v2 QT.${module_lower}.module_config = v2
QT.${module_lower}.DEFINES = QT_${module_upper}_LIB QT.${module_lower}.DEFINES = QT_${module_define}_LIB
QT.${module_lower}.enabled_features = ${enabled_features} QT.${module_lower}.enabled_features = ${enabled_features}
QT.${module_lower}.disabled_features = ${disabled_features}${module_config} QT.${module_lower}.disabled_features = ${disabled_features}${module_config}
QT_MODULES += ${module_lower} QT_MODULES += ${module_lower}
@ -644,15 +644,18 @@ endfunction()
# * foo_upper with the value "CORE" # * foo_upper with the value "CORE"
# * foo_lower with the value "core" # * foo_lower with the value "core"
# * foo_include_dir with the module's include directory in the binary tree # * foo_include_dir with the module's include directory in the binary tree
# * foo_define same as foo_uper but with - replaced as _
function(qt_internal_module_info result target) function(qt_internal_module_info result target)
set(module "Qt${target}") set(module "Qt${target}")
set("${result}" "${module}" PARENT_SCOPE) set("${result}" "${module}" PARENT_SCOPE)
set("${result}_versioned" "Qt${PROJECT_VERSION_MAJOR}${target}" PARENT_SCOPE) set("${result}_versioned" "Qt${PROJECT_VERSION_MAJOR}${target}" PARENT_SCOPE)
string(TOUPPER "${target}" upper) string(TOUPPER "${target}" upper)
string(TOLOWER "${target}" lower) string(TOLOWER "${target}" lower)# * foo_upper with the value "CORE"
string(REPLACE "-" "_" define "${upper}")
set("${result}_upper" "${upper}" PARENT_SCOPE) set("${result}_upper" "${upper}" PARENT_SCOPE)
set("${result}_lower" "${lower}" PARENT_SCOPE) set("${result}_lower" "${lower}" PARENT_SCOPE)
set("${result}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE) set("${result}_include_dir" "${QT_BUILD_DIR}/include/${module}" PARENT_SCOPE)
set("${result}_define" "${define}" PARENT_SCOPE)
endfunction() endfunction()
@ -1105,7 +1108,7 @@ function(add_qt_module target)
${arg_INCLUDE_DIRECTORIES} ${arg_INCLUDE_DIRECTORIES}
PUBLIC_DEFINES PUBLIC_DEFINES
${arg_PUBLIC_DEFINES} ${arg_PUBLIC_DEFINES}
QT_${module_upper}_LIB QT_${module_define}_LIB
DEFINES DEFINES
${arg_DEFINES} ${arg_DEFINES}
QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
@ -1113,7 +1116,7 @@ function(add_qt_module target)
QT_USE_QSTRINGBUILDER QT_USE_QSTRINGBUILDER
QT_DEPRECATED_WARNINGS QT_DEPRECATED_WARNINGS
QT_BUILDING_QT QT_BUILDING_QT
QT_BUILD_${module_upper}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore QT_BUILD_${module_define}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore
"${deprecation_define}" "${deprecation_define}"
PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES} PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
LIBRARIES ${arg_LIBRARIES} LIBRARIES ${arg_LIBRARIES}
@ -1453,12 +1456,12 @@ function(add_qt_plugin target)
QT_USE_QSTRINGBUILDER QT_USE_QSTRINGBUILDER
QT_DEPRECATED_WARNINGS QT_DEPRECATED_WARNINGS
QT_BUILDING_QT QT_BUILDING_QT
QT_BUILD_${module_upper}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore QT_BUILD_${module_define}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore
"${deprecation_define}" "${deprecation_define}"
"${static_plugin_define}" "${static_plugin_define}"
QT_PLUGIN QT_PLUGIN
PUBLIC_DEFINES PUBLIC_DEFINES
QT_${module_upper}_LIB QT_${module_define}_LIB
${arg_PUBLIC_DEFINES} ${arg_PUBLIC_DEFINES}
FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES} FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}" DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}"