diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-22 16:59:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-22 16:59:23 (GMT) |
| commit | 718033b97d56d97cb0b16d82cb5fdd565d6b2b83 (patch) | |
| tree | 8cd9a1710b22a43243d3441e23bb2d9e0d6900d6 | |
| parent | ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e (diff) | |
| parent | b2d7ab8bd17d0b5ccb1760e1058e670cea8eed49 (diff) | |
| download | CMake-718033b97d56d97cb0b16d82cb5fdd565d6b2b83.zip CMake-718033b97d56d97cb0b16d82cb5fdd565d6b2b83.tar.gz CMake-718033b97d56d97cb0b16d82cb5fdd565d6b2b83.tar.bz2 | |
Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13
Merge-request: !2511
| -rw-r--r-- | Modules/GNUInstallDirs.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake | 2 |
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() |