aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Rojas <arojas@archlinux.org>2019-08-28 07:45:20 +0200
committerAntonio Rojas <arojas@archlinux.org>2019-08-28 07:45:20 +0200
commitc806bd48a29fef3575891b78b06ed085d1bdfed1 (patch)
tree41ee93467ea24b6155fd3e494593cfb40d4e10d3
parent557e5d898bf95cfb999c1a0a4d9bd0c4bd5fe178 (diff)
downloadextra-cmake-modules-c806bd48a29fef3575891b78b06ed085d1bdfed1.tar.gz
extra-cmake-modules-c806bd48a29fef3575891b78b06ed085d1bdfed1.tar.bz2
Keep 'lib' as default LIBDIR on Arch Linux based systems
Port of upstream commit https://gitlab.kitware.com/cmake/cmake/commit/18365587c86396f988e256b5acf4d2312f3be2bb Differential Revision: https://phabricator.kde.org/D23497
-rw-r--r--kde-modules/KDEInstallDirs.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index 20032234..0acd33f0 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -247,6 +247,7 @@ set(_LIBDIR_DEFAULT "lib")
# See https://wiki.debian.org/Multiarch
if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
AND NOT CMAKE_CROSSCOMPILING
+ AND NOT EXISTS "/etc/arch-release"
AND NOT DEFINED ENV{FLATPAK_ID})
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)