mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-11 16:32:14 -06:00
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).
This commit is contained in:
1
Modules/Platform/GNU-Initialize.cmake
Normal file
1
Modules/Platform/GNU-Initialize.cmake
Normal file
@@ -0,0 +1 @@
|
||||
set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*")
|
||||
@@ -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)
|
||||
|
||||
2
Modules/Platform/QNX-Initialize.cmake
Normal file
2
Modules/Platform/QNX-Initialize.cmake
Normal file
@@ -0,0 +1,2 @@
|
||||
include(Platform/GNU-Initialize)
|
||||
unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
|
||||
@@ -1,7 +1,6 @@
|
||||
set(QNXNTO 1)
|
||||
|
||||
include(Platform/GNU)
|
||||
unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
|
||||
|
||||
set(CMAKE_DL_LIBS "")
|
||||
|
||||
|
||||
5
Modules/Platform/kFreeBSD-Initialize.cmake
Normal file
5
Modules/Platform/kFreeBSD-Initialize.cmake
Normal file
@@ -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_]*")
|
||||
@@ -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_]*")
|
||||
|
||||
Reference in New Issue
Block a user