summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Clarke <jrtc27@jrtc27.com>2018-10-21 08:59:11 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-22 16:58:54 (GMT)
commitb2d7ab8bd17d0b5ccb1760e1058e670cea8eed49 (patch)
tree1fc288e4e92361bd28aab9157487531fe96f2d97
parentfd02538974dd952a8639d371c2c0067d30d5469a (diff)
downloadCMake-b2d7ab8bd17d0b5ccb1760e1058e670cea8eed49.zip
CMake-b2d7ab8bd17d0b5ccb1760e1058e670cea8eed49.tar.gz
CMake-b2d7ab8bd17d0b5ccb1760e1058e670cea8eed49.tar.bz2
GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD
-rw-r--r--Modules/GNUInstallDirs.cmake2
-rw-r--r--Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 9dd464c..3dfcf8c 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -276,7 +276,7 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
"Read-only architecture-independent data (DATAROOTDIR)")
-if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
"Info documentation (info)")
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
diff --git a/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake b/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
index b544ba6..e00af58 100644
--- a/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
@@ -1,6 +1,6 @@
include(RunCMake)
-if(SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+if(SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
set(EXPECT_BSD 1)
endif()