diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2022-09-05 22:29:04 (GMT) |
|---|---|---|
| committer | Cristian Adam <cristian.adam@gmail.com> | 2022-09-05 23:02:34 (GMT) |
| commit | 288f72efea0636c498755a9cec6d5ddcbfed5c8c (patch) | |
| tree | 990b00b513085b8f843f697bbcec8333c32f1309 | |
| parent | 9b1b9b9aae371acb9d18b481d45bcaec2d312e27 (diff) | |
| download | CMake-288f72efea0636c498755a9cec6d5ddcbfed5c8c.zip CMake-288f72efea0636c498755a9cec6d5ddcbfed5c8c.tar.gz CMake-288f72efea0636c498755a9cec6d5ddcbfed5c8c.tar.bz2 | |
BSD: Only use BSD as variable for target BSD system
Instead of having multiple boolean variables, we only have one
string variable: BSD with the name of the target BSD system.
Relates: #23853
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/BSD.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/bsd-variables.rst | 9 | ||||
| -rw-r--r-- | Help/variable/BSD.rst | 3 | ||||
| -rw-r--r-- | Help/variable/DRAGONFLYBSD.rst | 6 | ||||
| -rw-r--r-- | Help/variable/FREEBSD.rst | 6 | ||||
| -rw-r--r-- | Help/variable/NETBSD.rst | 6 | ||||
| -rw-r--r-- | Help/variable/OPENBSD.rst | 6 | ||||
| -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 |
12 files changed, 11 insertions, 46 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index ad6bfbc..bb72c14 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -324,8 +324,6 @@ Variables that Describe the System /variable/CMAKE_SYSTEM_PROCESSOR /variable/CMAKE_SYSTEM_VERSION /variable/CYGWIN - /variable/DRAGONFLYBSD - /variable/FREEBSD /variable/GHSMULTI /variable/IOS /variable/LINUX @@ -344,8 +342,6 @@ Variables that Describe the System /variable/MSVC_TOOLSET_VERSION /variable/MSVC_VERSION /variable/MSYS - /variable/NETBSD - /variable/OPENBSD /variable/UNIX /variable/WIN32 /variable/WINCE diff --git a/Help/release/dev/BSD.rst b/Help/release/dev/BSD.rst new file mode 100644 index 0000000..fab2015 --- /dev/null +++ b/Help/release/dev/BSD.rst @@ -0,0 +1,5 @@ +Variables +--------- + +* The :variable:`BSD` variable is set to a string value when the target system is BSD. + This value can be one of the following: DragonFlyBSD, FreeBSD, OpenBSD, or NetBSD. diff --git a/Help/release/dev/bsd-variables.rst b/Help/release/dev/bsd-variables.rst deleted file mode 100644 index 9d59edc..0000000 --- a/Help/release/dev/bsd-variables.rst +++ /dev/null @@ -1,9 +0,0 @@ -bsd-variables -------------- - -* The :variable:`BSD` variable is set to true when the target system - is BSD (DragonFlyBSD, FreeBSD, OpenBSD, or NetBSD) -* The :variable:`DRAGONFLYBSD` variable is set to true when the target system is DragonFlyBSD. -* The :variable:`FREEBSD` variable is set to true when the target system is FreeBSD. -* The :variable:`NETBSD` variable is set to true when the target system is NetBSD. -* The :variable:`OPENBSD` variable is set to true when the target system is OpenBSD. diff --git a/Help/variable/BSD.rst b/Help/variable/BSD.rst index 0b3e5dc..fdfe5ec 100644 --- a/Help/variable/BSD.rst +++ b/Help/variable/BSD.rst @@ -3,4 +3,5 @@ BSD .. versionadded:: 3.25 -Set to true when the target system is BSD (DragonFlyBSD, FreeBSD, OpenBSD, or NetBSD) +Set to a string value when the target system is BSD. This value can be one of +the following: DragonFlyBSD, FreeBSD, OpenBSD, or NetBSD. diff --git a/Help/variable/DRAGONFLYBSD.rst b/Help/variable/DRAGONFLYBSD.rst deleted file mode 100644 index f006156..0000000 --- a/Help/variable/DRAGONFLYBSD.rst +++ /dev/null @@ -1,6 +0,0 @@ -DRAGONFLYBSD ------------- - -.. versionadded:: 3.25 - -Set to true when the target system is DragonFlyBSD. diff --git a/Help/variable/FREEBSD.rst b/Help/variable/FREEBSD.rst deleted file mode 100644 index 9990948..0000000 --- a/Help/variable/FREEBSD.rst +++ /dev/null @@ -1,6 +0,0 @@ -FREEBSD -------- - -.. versionadded:: 3.25 - -Set to true when the target system is FreeBSD. diff --git a/Help/variable/NETBSD.rst b/Help/variable/NETBSD.rst deleted file mode 100644 index e7965f8..0000000 --- a/Help/variable/NETBSD.rst +++ /dev/null @@ -1,6 +0,0 @@ -NETBSD ------- - -.. versionadded:: 3.25 - -Set to true when the target system is NetBSD. diff --git a/Help/variable/OPENBSD.rst b/Help/variable/OPENBSD.rst deleted file mode 100644 index dd9b23d..0000000 --- a/Help/variable/OPENBSD.rst +++ /dev/null @@ -1,6 +0,0 @@ -OPENBSD -------- - -.. versionadded:: 3.25 - -Set to true when the target system is OpenBSD. 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 |