Просмотр исходного кода

Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13

Merge-request: !2511
Brad King 7 лет назад
Родитель
Сommit
718033b97d
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      Modules/GNUInstallDirs.cmake
  2. 1 1
      Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake

+ 1 - 1
Modules/GNUInstallDirs.cmake

@@ -276,7 +276,7 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
 _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
 _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
   "Read-only architecture-independent data (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"
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
     "Info documentation (info)")
     "Info documentation (info)")
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"

+ 1 - 1
Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake

@@ -1,6 +1,6 @@
 include(RunCMake)
 include(RunCMake)
 
 
-if(SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+if(SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
   set(EXPECT_BSD 1)
   set(EXPECT_BSD 1)
 endif()
 endif()