diff options
| author | Hannah von Reth <vonreth@kde.org> | 2016-06-14 16:42:08 +0200 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2016-06-14 17:22:13 +0200 |
| commit | 2503481e4537b88d76b4a596f519cb3311e1ca2a (patch) | |
| tree | 0cc97a620ec5c21decd640d8675339f5d3efad9b /kde-modules/KDEInstallDirs.cmake | |
| parent | 2e7157797e1f57d81486c79281c1e8b290921144 (diff) | |
| download | extra-cmake-modules-2503481e4537b88d76b4a596f519cb3311e1ca2a.tar.gz extra-cmake-modules-2503481e4537b88d76b4a596f519cb3311e1ca2a.tar.bz2 | |
Use "${BIN_INSTALL_DIR}/data" for DATAROOTDIR on Windows.
Summary:
Instead of using "share" use "${BIN_INSTALL_DIR}/data" on Windows,
this is the location provided by QStandardPaths for GenericDataLocation
on Windows.
Reviewers: dfaure
Reviewed By: dfaure
Subscribers: kfunk
Differential Revision: https://phabricator.kde.org/D1873
Diffstat (limited to 'kde-modules/KDEInstallDirs.cmake')
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index d9c3b781..f518a4a0 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -489,10 +489,15 @@ _define_absolute(SHAREDSTATEDIR "com" - -_define_absolute(DATAROOTDIR "share" - "read-only architecture-independent data root" - SHARE_INSTALL_PREFIX) +if (WIN32) + _define_relative(DATAROOTDIR BINDIR "data" + "read-only architecture-independent data root" + SHARE_INSTALL_PREFIX) +else() + _define_absolute(DATAROOTDIR "share" + "read-only architecture-independent data root" + SHARE_INSTALL_PREFIX) +endif() _define_relative(DATADIR DATAROOTDIR "" "read-only architecture-independent data" |