summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-21 13:56:43 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-21 13:56:49 (GMT)
commit69b64ed85a59eaf29c1e25bb6247e12c7c8afabc (patch)
tree4f63afc4aa118a1f928adf85361ebf68d114545b
parenta01a88dc95e5df1291de7316ab35211b4f3ea34d (diff)
parent37b24e0bedcb2be97323d119897413addcb692e2 (diff)
downloadCMake-69b64ed85a59eaf29c1e25bb6247e12c7c8afabc.zip
CMake-69b64ed85a59eaf29c1e25bb6247e12c7c8afabc.tar.gz
CMake-69b64ed85a59eaf29c1e25bb6247e12c7c8afabc.tar.bz2
Merge topic 'GNUInstallDirs-alpine'
37b24e0bed GNUInstallDirs: don't use lib64 on Alpine Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6244
-rw-r--r--Modules/GNUInstallDirs.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index f7d8c36..d81033c 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -239,6 +239,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
endif()
if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
AND NOT CMAKE_CROSSCOMPILING
+ AND NOT EXISTS "/etc/alpine-release"
AND NOT EXISTS "/etc/arch-release")
if (EXISTS "/etc/debian_version") # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE)