diff options
author | Brad King <brad.king@kitware.com> | 2022-09-09 14:04:57 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-09 14:05:41 (GMT) |
commit | e71605dfb44c69db6fccb7d36a58b6c9f7761ed5 (patch) | |
tree | a5a9b2f71fde9a117aa66c4b51f87a4adee9f1d5 /Modules/Platform | |
parent | 281113af876a9cbc52b455c61766245448b02141 (diff) | |
parent | 1ea8b8ed86628ecaa6a6e47231cefb2d68ac9e73 (diff) | |
download | CMake-e71605dfb44c69db6fccb7d36a58b6c9f7761ed5.zip CMake-e71605dfb44c69db6fccb7d36a58b6c9f7761ed5.tar.gz CMake-e71605dfb44c69db6fccb7d36a58b6c9f7761ed5.tar.bz2 |
Merge topic 'BSD'
1ea8b8ed86 BSD: Set CMAKE_HOST_BSD variable on a BSD host
288f72efea BSD: Only use BSD as variable for target BSD system
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7648
Diffstat (limited to 'Modules/Platform')
-rw-r--r-- | Modules/Platform/DragonFly.cmake | 3 | ||||
-rw-r--r-- | Modules/Platform/FreeBSD.cmake | 3 | ||||
-rw-r--r-- | Modules/Platform/NetBSD.cmake | 3 | ||||
-rw-r--r-- | Modules/Platform/OpenBSD.cmake | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/Modules/Platform/DragonFly.cmake b/Modules/Platform/DragonFly.cmake index d8bc05a..994ba79 100644 --- a/Modules/Platform/DragonFly.cmake +++ b/Modules/Platform/DragonFly.cmake @@ -3,8 +3,7 @@ # see http://archive.netbsd.se/?ml=dfbsd-users&a=2007-07&m=4678361 include(Platform/FreeBSD) -unset(FREEBSD) -set(DRAGONFLYBSD 1) +set(BSD "DragonFlyBSD") # DragonFly BSD requires -z origin to enable $ORIGIN expansion in RPATH. # This is not required for FreeBSD since 10.2-RELEASE. diff --git a/Modules/Platform/FreeBSD.cmake b/Modules/Platform/FreeBSD.cmake index e968a78..9cd9399 100644 --- a/Modules/Platform/FreeBSD.cmake +++ b/Modules/Platform/FreeBSD.cmake @@ -1,5 +1,4 @@ -set(FREEBSD 1) -set(BSD 1) +set(BSD "FreeBSD") set(CMAKE_DL_LIBS "") set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") diff --git a/Modules/Platform/NetBSD.cmake b/Modules/Platform/NetBSD.cmake index a64bf0b..52c6594 100644 --- a/Modules/Platform/NetBSD.cmake +++ b/Modules/Platform/NetBSD.cmake @@ -1,5 +1,4 @@ -set(NETBSD 1) -set(BSD 1) +set(BSD "NetBSD") set(CMAKE_DL_LIBS "") set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake index f6b955a..51ea60d 100644 --- a/Modules/Platform/OpenBSD.cmake +++ b/Modules/Platform/OpenBSD.cmake @@ -1,6 +1,5 @@ include(Platform/NetBSD) -unset(NETBSD) -set(OPENBSD 1) +set(BSD "OpenBSD") # On OpenBSD, the compile time linker does not share it's configuration with # the runtime linker. This will extract the library search paths from the |