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

CMake: Write gcc sysroot flags to qconfig.pri

Browse Source 
For a cross-built, gcc-built Qt, the qmake build writes code into
qconfig.pri that adds the --sysroot flag to compiler and linker flags.
Follow suit in the CMake build.

To keep the diff small between the qmake-generated and CMake-generated
qconfig.pri files, the sysroot code is added at the top of
qconfig.pri, which is the reason for the new 'content' string variable.

Change-Id: I50649100e4368be64bf98ca19e46312e3ebf619d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-06-26 14:38:40 +02:00
parent d7fd684861
commit 2299b61d0c
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cmake/QtBuild.cmake
View File

@ -1147,6 +1147,29 @@ 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(content "")
if(GCC OR CLANG AND NOT "${CMAKE_SYSROOT}" STREQUAL "")
string(APPEND content "!host_build {
QMAKE_CFLAGS += --sysroot=\$\$[QT_SYSROOT]
QMAKE_CXXFLAGS += --sysroot=\$\$[QT_SYSROOT]
QMAKE_LFLAGS += --sysroot=\$\$[QT_SYSROOT]
}
")
endif()
string(APPEND content "QT_ARCH = ${TEST_architecture_arch}
QT_BUILDABI = ${TEST_buildAbi}
QT.global.enabled_features = ${corrected_enabled_features}
QT.global.disabled_features = ${corrected_disabled_features}
QT.global.disabled_features += release build_all
QT_CONFIG += ${qt_public_config_joined}
CONFIG += ${config_entries} ${public_config_joined}
QT_VERSION = ${PROJECT_VERSION}
QT_MAJOR_VERSION = ${PROJECT_VERSION_MAJOR}
QT_MINOR_VERSION = ${PROJECT_VERSION_MINOR}
QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH}
")
set(extra_statements "") set(extra_statements "")
if(QT_NAMESPACE) if(QT_NAMESPACE)
list(APPEND extra_statements "QT_NAMESPACE = ${QT_NAMESPACE}") list(APPEND extra_statements "QT_NAMESPACE = ${QT_NAMESPACE}")
@ -1193,24 +1216,12 @@ function(qt_generate_global_config_pri_file)
if(extra_statements) if(extra_statements)
string(REPLACE ";" "\n" extra_statements "${extra_statements}") string(REPLACE ";" "\n" extra_statements "${extra_statements}")
string(APPEND content "\n${extra_statements}")
endif() endif()
file(GENERATE file(GENERATE
OUTPUT "${qconfig_pri_target_path}" OUTPUT "${qconfig_pri_target_path}"
CONTENT CONTENT "${content}"
"QT_ARCH = ${TEST_architecture_arch}
QT_BUILDABI = ${TEST_buildAbi}
QT.global.enabled_features = ${corrected_enabled_features}
QT.global.disabled_features = ${corrected_disabled_features}
QT.global.disabled_features += release build_all
QT_CONFIG += ${qt_public_config_joined}
CONFIG += ${config_entries} ${public_config_joined}
QT_VERSION = ${PROJECT_VERSION}
QT_MAJOR_VERSION = ${PROJECT_VERSION_MAJOR}
QT_MINOR_VERSION = ${PROJECT_VERSION_MINOR}
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})
endfunction() endfunction()