diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-27 14:57:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-27 14:58:28 (GMT) |
| commit | bd4d52f7ded45d82781294b2374a1b845cbbb020 (patch) | |
| tree | 46f7196feac58341843344bdbc9fc24060128839 | |
| parent | 613ac3e7d526d3874176e2b70eba342836a9b6b5 (diff) | |
| parent | 18365587c86396f988e256b5acf4d2312f3be2bb (diff) | |
| download | CMake-bd4d52f7ded45d82781294b2374a1b845cbbb020.zip CMake-bd4d52f7ded45d82781294b2374a1b845cbbb020.tar.gz CMake-bd4d52f7ded45d82781294b2374a1b845cbbb020.tar.bz2 | |
Merge topic 'GNUInstallDirs-arch-linux'
18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3735
| -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/?$") |