diff options
| -rw-r--r-- | cmake/QtBaseHelpers.cmake | 8 | ||||
| -rw-r--r-- | cmake/QtBuildPathsHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtHostInfoConfig.cmake.in | 1 | ||||
| -rw-r--r-- | cmake/QtInstallPaths.cmake.in | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/cmake/QtBaseHelpers.cmake b/cmake/QtBaseHelpers.cmake index 981fcfafd46..e47b8d81bc9 100644 --- a/cmake/QtBaseHelpers.cmake +++ b/cmake/QtBaseHelpers.cmake @@ -151,10 +151,10 @@ endmacro() function(qt_internal_qtbase_install_wayland_files) qt_path_join(wlprotocols_build_dir ${QT_BUILD_DIR} - ${INSTALL_SHAREDIR}/qt6/wayland/protocols) + ${INSTALL_QT_SHAREDIR}/wayland/protocols) qt_path_join(wlprotocols_install_dir ${QT_INSTALL_DIR} - ${INSTALL_SHAREDIR}/qt6/wayland/protocols) + ${INSTALL_QT_SHAREDIR}/wayland/protocols) file(GLOB wlprotocols_subdirs LIST_DIRECTORIES TRUE @@ -178,10 +178,10 @@ function(qt_internal_qtbase_install_wayland_files) qt_path_join(wlextensions_build_dir ${QT_BUILD_DIR} - ${INSTALL_SHAREDIR}/qt6/wayland/extensions) + ${INSTALL_QT_SHAREDIR}/wayland/extensions) qt_path_join(wlextensions_install_dir ${QT_INSTALL_DIR} - ${INSTALL_SHAREDIR}/qt6/wayland/extensions) + ${INSTALL_QT_SHAREDIR}/wayland/extensions) file(GLOB wlextensions_subdirs LIST_DIRECTORIES TRUE diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake index 8d0f0bfa13a..bac0e352086 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -161,6 +161,8 @@ macro(qt_internal_setup_configure_install_paths) qt_configure_process_path(INSTALL_LIBDIR "lib" "Libraries [PREFIX/lib]") qt_configure_process_path(INSTALL_MKSPECSDIR "mkspecs" "Mkspecs files [PREFIX/mkspecs]") qt_configure_process_path(INSTALL_SHAREDIR "share" "Share files [PREFIX/share]") + qt_configure_process_path(INSTALL_QT_SHAREDIR "${INSTALL_SHAREDIR}/qt6" + "Qt namespaced sharedir [SHAREDIR/qt6]") qt_configure_process_path(INSTALL_ARCHDATADIR "." "Arch-dependent data [PREFIX]") qt_configure_process_path(INSTALL_PLUGINSDIR "${INSTALL_ARCHDATADIR}/plugins" diff --git a/cmake/QtHostInfoConfig.cmake.in b/cmake/QtHostInfoConfig.cmake.in index eb4db00231e..959b7d848ed 100644 --- a/cmake/QtHostInfoConfig.cmake.in +++ b/cmake/QtHostInfoConfig.cmake.in @@ -19,6 +19,7 @@ set(@var_prefix@EXAMPLESDIR "@INSTALL_EXAMPLESDIR@") set(@var_prefix@TESTSDIR "@INSTALL_TESTSDIR@") set(@var_prefix@DESCRIPTIONSDIR "@INSTALL_DESCRIPTIONSDIR@") set(@var_prefix@SHAREDIR "@INSTALL_SHAREDIR@") +set(@var_prefix@QT_SHAREDIR "@INSTALL_QT_SHAREDIR@") set(@var_prefix@QMAKE_MKSPEC "@QT_QMAKE_TARGET_MKSPEC@") set(@var_prefix@ARCH "@TEST_architecture_arch@") set(@var_prefix@SUBARCHS "@TEST_subarch_result@") diff --git a/cmake/QtInstallPaths.cmake.in b/cmake/QtInstallPaths.cmake.in index 88b8909e147..b433a860458 100644 --- a/cmake/QtInstallPaths.cmake.in +++ b/cmake/QtInstallPaths.cmake.in @@ -16,3 +16,4 @@ set(QT@PROJECT_VERSION_MAJOR@_INSTALL_TESTS "@INSTALL_TESTSDIR@") set(QT@PROJECT_VERSION_MAJOR@_INSTALL_TRANSLATIONS "@INSTALL_TRANSLATIONSDIR@") set(QT@PROJECT_VERSION_MAJOR@_INSTALL_DESCRIPTIONSDIR "@INSTALL_DESCRIPTIONSDIR@") set(QT@PROJECT_VERSION_MAJOR@_INSTALL_SHAREDIR "@INSTALL_SHAREDIR@") +set(QT@PROJECT_VERSION_MAJOR@_INSTALL_QT_SHAREDIR "@INSTALL_QT_SHAREDIR@") |