You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.5 KiB
37 lines
1.5 KiB
From b2d7ab8bd17d0b5ccb1760e1058e670cea8eed49 Mon Sep 17 00:00:00 2001
|
|
From: James Clarke <jrtc27@jrtc27.com>
|
|
Date: Sun, 21 Oct 2018 09:59:11 +0100
|
|
Subject: [PATCH] GNUInstallDirs: Don't use BSD info and man paths on
|
|
GNU/kFreeBSD
|
|
|
|
---
|
|
Modules/GNUInstallDirs.cmake | 2 +-
|
|
Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
|
|
index 9dd464c8de..3dfcf8c959 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 b544ba6400..e00af581bc 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()
|
|
|