diff options
| author | Antonio Rojas <arojas@archlinux.org> | 2019-08-25 08:46:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-26 15:14:13 (GMT) |
| commit | 18365587c86396f988e256b5acf4d2312f3be2bb (patch) | |
| tree | dc3e00606c2f2240649318af017395cd60f90d4e /Modules/GNUInstallDirs.cmake | |
| parent | 2a1be178de5f12d55ec486609f4512e6b2b9d168 (diff) | |
| download | CMake-18365587c86396f988e256b5acf4d2312f3be2bb.zip CMake-18365587c86396f988e256b5acf4d2312f3be2bb.tar.gz CMake-18365587c86396f988e256b5acf4d2312f3be2bb.tar.bz2 | |
GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems
Fixes: #15373
Diffstat (limited to 'Modules/GNUInstallDirs.cmake')
| -rw-r--r-- | Modules/GNUInstallDirs.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index 4db4e18..f95e6e2 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -222,7 +222,8 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set # updated to the new default, unless the user explicitly changed it. endif() if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" - AND NOT CMAKE_CROSSCOMPILING) + AND NOT CMAKE_CROSSCOMPILING + AND NOT EXISTS "/etc/arch-release") if (EXISTS "/etc/debian_version") # is this a debian system ? if(CMAKE_LIBRARY_ARCHITECTURE) if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") |