diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-06 19:31:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-06-06 19:35:20 (GMT) |
| commit | 1d916bf3d2dad26682ed73c6cbed88babe28af7b (patch) | |
| tree | 3b6730eb46abb521eabd568298523459737e447d | |
| parent | c01091d2cf786f361a47a2875ba73d05c1642488 (diff) | |
| download | CMake-1d916bf3d2dad26682ed73c6cbed88babe28af7b.zip CMake-1d916bf3d2dad26682ed73c6cbed88babe28af7b.tar.gz CMake-1d916bf3d2dad26682ed73c6cbed88babe28af7b.tar.bz2 | |
kFreeBSD,GNU: Provide multiarch library directory regex earlier
Make `CMAKE_LIBRARY_ARCHITECTURE_REGEX` available while determining
compilers before `Platform/{kFreeBSD,GNU}` is loaded.
Follow up commit cc737ae829 (Linux: Provide multiarch library directory
regex earlier, 2023-05-31).
| -rw-r--r-- | Modules/Platform/GNU-Initialize.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/GNU.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/QNX-Initialize.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/QNX.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/kFreeBSD-Initialize.cmake | 5 | ||||
| -rw-r--r-- | Modules/Platform/kFreeBSD.cmake | 5 |
6 files changed, 9 insertions, 7 deletions
diff --git a/Modules/Platform/GNU-Initialize.cmake b/Modules/Platform/GNU-Initialize.cmake new file mode 100644 index 0000000..37875ab --- /dev/null +++ b/Modules/Platform/GNU-Initialize.cmake @@ -0,0 +1 @@ +set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*") diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake index fac29a8..188135b 100644 --- a/Modules/Platform/GNU.cmake +++ b/Modules/Platform/GNU.cmake @@ -35,6 +35,4 @@ else() endif() endif() -set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*") - include(Platform/UnixPaths) diff --git a/Modules/Platform/QNX-Initialize.cmake b/Modules/Platform/QNX-Initialize.cmake new file mode 100644 index 0000000..21a2cdd --- /dev/null +++ b/Modules/Platform/QNX-Initialize.cmake @@ -0,0 +1,2 @@ +include(Platform/GNU-Initialize) +unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX) diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake index ebc4609..f093314 100644 --- a/Modules/Platform/QNX.cmake +++ b/Modules/Platform/QNX.cmake @@ -1,7 +1,6 @@ set(QNXNTO 1) include(Platform/GNU) -unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX) set(CMAKE_DL_LIBS "") diff --git a/Modules/Platform/kFreeBSD-Initialize.cmake b/Modules/Platform/kFreeBSD-Initialize.cmake new file mode 100644 index 0000000..f5d7b0a --- /dev/null +++ b/Modules/Platform/kFreeBSD-Initialize.cmake @@ -0,0 +1,5 @@ +# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD, +# and should be marked as LINUX +include(Platform/Linux-Initialize) + +set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*") diff --git a/Modules/Platform/kFreeBSD.cmake b/Modules/Platform/kFreeBSD.cmake index 09c240d..171c1ac 100644 --- a/Modules/Platform/kFreeBSD.cmake +++ b/Modules/Platform/kFreeBSD.cmake @@ -1,5 +1,2 @@ -# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD, -# and should be marked as LINUX +# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD. include(Platform/Linux) - -set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*") |