diff options
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPluginHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 7 | ||||
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 1 | ||||
| -rw-r--r-- | cmake/configure-cmake-mapping.md | 2 | ||||
| -rw-r--r-- | config_help.txt | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 2ab91cc954..f5e43d7b30 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -139,7 +139,7 @@ function(qt_internal_add_module target) ) else() set_target_properties(${target} PROPERTIES - OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}" + OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}${QT_LIBINFIX}" ) endif() diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 73aa6c2fd3..4258555d98 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -67,7 +67,7 @@ function(qt_internal_add_plugin target) if(arg_OUTPUT_NAME) set(output_name "${arg_OUTPUT_NAME}") 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. if(arg_OUTPUT_NAME AND NOT TARGET "${output_name}") diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index f1723cd495..007acc95dd 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -233,7 +233,7 @@ function(qt_generate_module_pri_file target) CONTENT "QT.${config_module_name}.VERSION = ${PROJECT_VERSION} 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}.includes = ${public_module_includes} QT.${config_module_name}.frameworks = ${public_module_frameworks} @@ -479,7 +479,10 @@ QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH} if(QT_NAMESPACE) list(APPEND extra_statements "QT_NAMESPACE = ${QT_NAMESPACE}") 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. if(APPLECLANG) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 25910cf24c..794f675666 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -542,6 +542,7 @@ translate_boolean_input(precompile_header BUILD_WITH_PCH) translate_boolean_input(ccache QT_USE_CCACHE) translate_boolean_input(shared BUILD_SHARED_LIBS) translate_string_input(qt_namespace QT_NAMESPACE) +translate_string_input(qt_libinfix QT_LIBINFIX) translate_string_input(qreal QT_COORD_TYPE) translate_path_input(prefix CMAKE_INSTALL_PREFIX) translate_path_input(extprefix CMAKE_STAGING_PREFIX) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 5a102f8d0e..ab29ef67ea 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -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. | | -appstore-compliant | -DFEATURE_appstore_compliant=ON | | | -qtnamespace <name> | -DQT_NAMESPACE=<name> | | -| -qtlibinfix <infix> | | | +| -qtlibinfix <infix> | -DQT_LIBINFIX=<infix> | | | -testcocoon | | | | -gcov | | | | -trace [backend] | -DINPUT_trace=yes or -DINPUT_trace=<backend> | | diff --git a/config_help.txt b/config_help.txt index 9752904a89..e790c61e7d 100644 --- a/config_help.txt +++ b/config_help.txt @@ -125,7 +125,7 @@ Build options: iOS, tvOS, and watchOS. [auto] -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] -gcov ................ Instrument with the GCov code coverage tool [no] |