diff options
| author | Cristian Le <cristian.le@qt.io> | 2025-05-26 12:20:50 +0200 |
|---|---|---|
| committer | Cristian Le <cristian.le@qt.io> | 2025-06-02 16:40:54 +0200 |
| commit | cebdf1eb1cbab983a2392695a2491bcdd9ca257d (patch) | |
| tree | 8b6b8288cb3190ebba08b537cc33e71d1d6a9e78 /cmake/QtBuildPathsHelpers.cmake | |
| parent | d08f1d7dbc7b3fc23b81db1ded3314c1cf0dfeb2 (diff) | |
Introduce INSTALL_QT_SHAREDIR
Normally `INSTALL_DATADIR` is the canonical place for
`share`/`CMAKE_INSTALL_DATADIR`, but this standard is not well
enforced.
In 834d92a, `INSTALL_SHAREDIR` was introduced to better enforce this
standard and allow to install into third-party program's
`CMAKE_INSTALL_DATADIR` (e.g. wayland). This ended up being used as
`INSTALL_SHAREDIR/qt6` instead, but this leaves little room for
configuration and renaming.
This change introduces a namespaced variant that is guaranteed to be
owned by Qt.
Pick-to: 6.10
Change-Id: I25c0e5b47c402b178120e9e628fdfaf4aaad27ad
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuildPathsHelpers.cmake')
| -rw-r--r-- | cmake/QtBuildPathsHelpers.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
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" |