root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CMake: Tweak comments 

Co-authored-by: Lasse Collin <lasse.collin@tukaani.org>
This commit is contained in:
Sam James 2024-06-24 19:25:30 +01:00 committed by Lasse Collin
parent 3c95c93bca
commit 068a70e549
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -427,7 +427,7 @@ endif()
option(BUILD_SHARED_LIBS "Build liblzma as a shared library instead of static") option(BUILD_SHARED_LIBS "Build liblzma as a shared library instead of static")
# Symbol versioning is supported ELF shared libraries on certain OSes. # Symbol versioning is supported with ELF shared libraries on certain OSes.
# First assume that symbol versioning isn't supported. # First assume that symbol versioning isn't supported.
set(SYMBOL_VERSIONING "no") set(SYMBOL_VERSIONING "no")
@ -601,11 +601,11 @@ set_property(CACHE XZ_THREADS
PROPERTY STRINGS "${SUPPORTED_THREADING_METHODS}") PROPERTY STRINGS "${SUPPORTED_THREADING_METHODS}")
# This is a flag variable set when win95 threads are used. We must ensure # This is a flag variable set when win95 threads are used. We must ensure
# the combination of enable_small and win95 threads is not used without a # that the combination of XZ_SMALL and win95 threads is only used with a
# compiler supporting attribute __constructor__. # compiler that supports the __constructor__ attribute.
set(USE_WIN95_THREADS OFF) set(USE_WIN95_THREADS OFF)
# This is a flag variable set when posix threads (pthreads) are used. # This is a flag variable set when posix threading (pthreads) is used.
# It's needed when creating liblzma-config.cmake where dependency on # It's needed when creating liblzma-config.cmake where dependency on
# Threads::Threads is only needed with pthreads. # Threads::Threads is only needed with pthreads.
set(USE_POSIX_THREADS OFF) set(USE_POSIX_THREADS OFF)
@ -621,7 +621,7 @@ if(XZ_THREADS)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
# If both Windows and posix threading are available, prefer Windows. # If both Windows and posix threading are available, prefer Windows.
# Note that on Cygwin CMAKE_USE_WIN32_THREADS_INIT is false. # Note that on Cygwin, CMAKE_USE_WIN32_THREADS_INIT is false.
if(CMAKE_USE_WIN32_THREADS_INIT AND NOT XZ_THREADS STREQUAL "posix") if(CMAKE_USE_WIN32_THREADS_INIT AND NOT XZ_THREADS STREQUAL "posix")
if(XZ_THREADS STREQUAL "win95" if(XZ_THREADS STREQUAL "win95"
OR (XZ_THREADS STREQUAL "yes" AND CMAKE_SIZEOF_VOID_P EQUAL 4)) OR (XZ_THREADS STREQUAL "yes" AND CMAKE_SIZEOF_VOID_P EQUAL 4))
@ -1229,9 +1229,8 @@ tuklib_add_definition_if(liblzma HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR)
# result this configuration is not allowed. # result this configuration is not allowed.
if(USE_WIN95_THREADS AND XZ_SMALL AND NOT HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR) if(USE_WIN95_THREADS AND XZ_SMALL AND NOT HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR)
message(SEND_ERROR "Threading method win95 and XZ_SMALL " message(SEND_ERROR "Threading method win95 and XZ_SMALL "
"cannot be used at the same time with a compiler " "cannot be used at the same time because the compiler "
"that doesn't support " "doesn't support __attribute__((__constructor__))")
"__attribute__((__constructor__))")
endif() endif()