From 834d92a7ad2fb04e512fa34d173a0c5a781663b2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 11 Apr 2025 19:55:21 +0200 Subject: [PATCH] cmake: add INSTALL_SHAREDIR For Wayland protocols, "/usr/share/wayland-protocols/" is used on Ubuntu/Debian derived, and same for arch. The share directory is different with data and archdata directories. Change-Id: I3bdd5bdc60bd4f66de66aecc943893978c86f19b Reviewed-by: Alexandru Croitor Reviewed-by: Eskil Abrahamsen Blomfeldt --- cmake/QtBuildPathsHelpers.cmake | 1 + cmake/QtHostInfoConfig.cmake.in | 1 + cmake/QtInstallPaths.cmake.in | 1 + 3 files changed, 3 insertions(+) diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake index b011b905fe9..8d0f0bfa13a 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -160,6 +160,7 @@ macro(qt_internal_setup_configure_install_paths) qt_configure_process_path(INSTALL_INCLUDEDIR "include" "Header files [PREFIX/include]") 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_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 a1d069ec01a..eb4db00231e 100644 --- a/cmake/QtHostInfoConfig.cmake.in +++ b/cmake/QtHostInfoConfig.cmake.in @@ -18,6 +18,7 @@ set(@var_prefix@SYSCONFDIR "@INSTALL_SYSCONFDIR@") 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@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 020aafeeafe..88b8909e147 100644 --- a/cmake/QtInstallPaths.cmake.in +++ b/cmake/QtInstallPaths.cmake.in @@ -15,3 +15,4 @@ set(QT@PROJECT_VERSION_MAJOR@_INSTALL_QML "@INSTALL_QMLDIR@") 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@")