root/xz
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2025-02-25 09:58:18 +00:00
Code Issues Releases Wiki Activity

CMake: Use MATCHES instead of multiple STREQUAL

Browse Source
This commit is contained in:
Lasse Collin 2024-06-24 21:19:14 +03:00
parent d3f20382fc
commit 78e882205e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -457,8 +457,7 @@ symbol versioning (${SUPPORTED_SYMBOL_VERSIONING_VARIANTS})")
"symbol versioning variant") "symbol versioning variant")
endif() endif()
if(NOT XZ_SYMBOL_VERSIONING STREQUAL "auto" AND if(NOT XZ_SYMBOL_VERSIONING MATCHES "^auto$|^yes$")
NOT XZ_SYMBOL_VERSIONING STREQUAL "yes")
# Autodetection was disabled. Use the user-specified value as is. # Autodetection was disabled. Use the user-specified value as is.
set(SYMBOL_VERSIONING "${XZ_SYMBOL_VERSIONING}") set(SYMBOL_VERSIONING "${XZ_SYMBOL_VERSIONING}")
else() else()
@ -507,8 +506,7 @@ symbol versioning (${SUPPORTED_SYMBOL_VERSIONING_VARIANTS})")
# which are pointless on non-glibc non-Linux systems. # which are pointless on non-glibc non-Linux systems.
set(SYMBOL_VERSIONING "linux") set(SYMBOL_VERSIONING "linux")
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR elseif(CMAKE_SYSTEM_NAME MATCHES "^FreeBSD$|^GNU$" OR
CMAKE_SYSTEM_NAME STREQUAL "GNU" OR
XZ_SYMBOL_VERSIONING STREQUAL "yes") XZ_SYMBOL_VERSIONING STREQUAL "yes")
set(SYMBOL_VERSIONING "generic") set(SYMBOL_VERSIONING "generic")
endif() endif()
@ -638,7 +636,7 @@ if(XZ_THREADS)
add_compile_definitions(MYTHREAD_VISTA) add_compile_definitions(MYTHREAD_VISTA)
endif() endif()
elseif(CMAKE_USE_PTHREADS_INIT) elseif(CMAKE_USE_PTHREADS_INIT)
if(XZ_THREADS STREQUAL "posix" OR XZ_THREADS STREQUAL "yes") if(XZ_THREADS MATCHES "^posix$|^yes$")
# The threading library only needs to be explicitly linked # The threading library only needs to be explicitly linked
# for posix threads, so this is needed for creating # for posix threads, so this is needed for creating
# liblzma-config.cmake later. # liblzma-config.cmake later.
@ -2221,8 +2219,7 @@ xzdiff, xzgrep, xzmore, xzless, and their symlinks" ON)
set(enable_path_for_scripts) set(enable_path_for_scripts)
get_filename_component(POSIX_SHELL_DIR "${XZ_POSIX_SHELL}" DIRECTORY) get_filename_component(POSIX_SHELL_DIR "${XZ_POSIX_SHELL}" DIRECTORY)
if(NOT POSIX_SHELL_DIR STREQUAL "/bin" AND if(NOT POSIX_SHELL_DIR MATCHES "^/bin$|^/usr/bin$")
NOT POSIX_SHELL_DIR STREQUAL "/usr/bin")
set(enable_path_for_scripts "PATH=${POSIX_SHELL_DIR}:\$PATH") set(enable_path_for_scripts "PATH=${POSIX_SHELL_DIR}:\$PATH")
endif() endif()