AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake Build: Add support for -qtlibinfix configure parameter

Browse Source 
Rename all libQt6*.so to libQt6*<infix>.so

Task-number: QTBUG-85438
Change-Id: I4b91ffaaec7bea61454b0d3c794c77f2d0868d54
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Adam 2020-09-21 15:45:28 +02:00 committed by Cristian Adam
parent 42500dd9ca
commit 079cf55111
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtModuleHelpers.cmake
View File

@ -139,7 +139,7 @@ function(qt_internal_add_module target)
) )
else() else()
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}" OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}${QT_LIBINFIX}"
) )
endif() endif()

2
cmake/QtPluginHelpers.cmake
View File

@ -67,7 +67,7 @@ function(qt_internal_add_plugin target)
if(arg_OUTPUT_NAME) if(arg_OUTPUT_NAME)
set(output_name "${arg_OUTPUT_NAME}") set(output_name "${arg_OUTPUT_NAME}")
endif() endif()
set_property(TARGET "${target}" PROPERTY OUTPUT_NAME "${output_name}") set_property(TARGET "${target}" PROPERTY OUTPUT_NAME "${output_name}${QT_LIBINFIX}")
# Add a custom target with the Qt5 qmake name for a more user friendly ninja experience. # Add a custom target with the Qt5 qmake name for a more user friendly ninja experience.
if(arg_OUTPUT_NAME AND NOT TARGET "${output_name}") if(arg_OUTPUT_NAME AND NOT TARGET "${output_name}")

7
cmake/QtPriHelpers.cmake
View File

@ -233,7 +233,7 @@ function(qt_generate_module_pri_file target)
CONTENT CONTENT
"QT.${config_module_name}.VERSION = ${PROJECT_VERSION} "QT.${config_module_name}.VERSION = ${PROJECT_VERSION}
QT.${config_module_name}.name = ${module} QT.${config_module_name}.name = ${module}
QT.${config_module_name}.module = ${module_name_in_pri} QT.${config_module_name}.module = ${module_name_in_pri}${QT_LIBINFIX}
QT.${config_module_name}.libs = $$QT_MODULE_LIB_BASE QT.${config_module_name}.libs = $$QT_MODULE_LIB_BASE
QT.${config_module_name}.includes = ${public_module_includes} QT.${config_module_name}.includes = ${public_module_includes}
QT.${config_module_name}.frameworks = ${public_module_frameworks} QT.${config_module_name}.frameworks = ${public_module_frameworks}
@ -479,7 +479,10 @@ QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH}
if(QT_NAMESPACE) if(QT_NAMESPACE)
list(APPEND extra_statements "QT_NAMESPACE = ${QT_NAMESPACE}") list(APPEND extra_statements "QT_NAMESPACE = ${QT_NAMESPACE}")
endif() endif()
# TODO: Add libinfix support.
if(QT_LIBINFIX)
list(APPEND extra_statements "QT_LIBINFIX = ${QT_LIBINFIX}")
endif()
# TODO: Add QT_EMCC_VERSION when WASM is ported over. # TODO: Add QT_EMCC_VERSION when WASM is ported over.
if(APPLECLANG) if(APPLECLANG)

1
cmake/QtProcessConfigureArgs.cmake
View File

@ -542,6 +542,7 @@ translate_boolean_input(precompile_header BUILD_WITH_PCH)
translate_boolean_input(ccache QT_USE_CCACHE) translate_boolean_input(ccache QT_USE_CCACHE)
translate_boolean_input(shared BUILD_SHARED_LIBS) translate_boolean_input(shared BUILD_SHARED_LIBS)
translate_string_input(qt_namespace QT_NAMESPACE) translate_string_input(qt_namespace QT_NAMESPACE)
translate_string_input(qt_libinfix QT_LIBINFIX)
translate_string_input(qreal QT_COORD_TYPE) translate_string_input(qreal QT_COORD_TYPE)
translate_path_input(prefix CMAKE_INSTALL_PREFIX) translate_path_input(prefix CMAKE_INSTALL_PREFIX)
translate_path_input(extprefix CMAKE_STAGING_PREFIX) translate_path_input(extprefix CMAKE_STAGING_PREFIX)

2
cmake/configure-cmake-mapping.md
View File

@ -47,7 +47,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
| | | The device options are written into mkspecs/qdevice.pri. | | | | The device options are written into mkspecs/qdevice.pri. |
| -appstore-compliant | -DFEATURE_appstore_compliant=ON | | | -appstore-compliant | -DFEATURE_appstore_compliant=ON | |
| -qtnamespace <name> | -DQT_NAMESPACE=<name> | | | -qtnamespace <name> | -DQT_NAMESPACE=<name> | |
| -qtlibinfix <infix> | | | | -qtlibinfix <infix> | -DQT_LIBINFIX=<infix> | |
| -testcocoon | | | | -testcocoon | | |
| -gcov | | | | -gcov | | |
| -trace [backend] | -DINPUT_trace=yes or -DINPUT_trace=<backend> | | | -trace [backend] | -DINPUT_trace=yes or -DINPUT_trace=<backend> | |

2
config_help.txt
View File

@ -125,7 +125,7 @@ Build options:
iOS, tvOS, and watchOS. [auto] iOS, tvOS, and watchOS. [auto]
-qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'. -qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'.
-qtlibinfix <infix> .. Rename all libQt5*.so to libQt5*<infix>.so. -qtlibinfix <infix> .. Rename all libQt6*.so to libQt6*<infix>.so.
-testcocoon .......... Instrument with the TestCocoon code coverage tool [no] -testcocoon .......... Instrument with the TestCocoon code coverage tool [no]
-gcov ................ Instrument with the GCov code coverage tool [no] -gcov ................ Instrument with the GCov code coverage tool [no]