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

CMake: Record info about namespaced build for qmake

Browse Source 
To make sure qmake generates appropriate rules when building other
applications.

Task-number: QTBUG-84781
Change-Id: I75618575602be820bf20a8067e3a6ee3ff7e7950
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-06-17 09:11:50 +02:00
parent 17d8b54cbc
commit 3452b08df6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtBuild.cmake
View File

@ -1101,6 +1101,14 @@ function(qt_generate_global_config_pri_file)
list(JOIN corrected_public_config " " public_config_joined) list(JOIN corrected_public_config " " public_config_joined)
list(JOIN corrected_qt_public_config " " qt_public_config_joined) list(JOIN corrected_qt_public_config " " qt_public_config_joined)
set(extra_statements "")
if(QT_NAMESPACE)
list(APPEND extra_statements "QT_NAMESPACE = ${QT_NAMESPACE}")
endif()
if(extra_statements)
string (REPLACE ";" "\n" extra_statements "${extra_statements}")
endif()
file(GENERATE file(GENERATE
OUTPUT "${qconfig_pri_target_path}" OUTPUT "${qconfig_pri_target_path}"
CONTENT CONTENT
@ -1115,6 +1123,7 @@ QT_VERSION = ${PROJECT_VERSION}
QT_MAJOR_VERSION = ${PROJECT_VERSION_MAJOR} QT_MAJOR_VERSION = ${PROJECT_VERSION_MAJOR}
QT_MINOR_VERSION = ${PROJECT_VERSION_MINOR} QT_MINOR_VERSION = ${PROJECT_VERSION_MINOR}
QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH} QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH}
${extra_statements}
" "
) )
qt_install(FILES "${qconfig_pri_target_path}" DESTINATION ${INSTALL_MKSPECSDIR}) qt_install(FILES "${qconfig_pri_target_path}" DESTINATION ${INSTALL_MKSPECSDIR})