streamline bundled dependency CMake scripts

2025-02-21 03:29:25 +11:00 · 2024-03-25 23:24:40 +11:00
parent fb7cef3bc8
commit 8a6916eabe
11 changed files with 100 additions and 547 deletions
--- a/ext/zstd/CMakeLists.txt
+++ b/ext/zstd/CMakeLists.txt
@@ -7,21 +7,51 @@
 # in the COPYING file in the root directory of this source tree).
 # ################################################################

-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
-
 set(LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib)

 # Parse version
-include(GetZstdLibraryVersion)
-GetZstdLibraryVersion(${LIBRARY_DIR}/zstd.h zstd_VERSION_MAJOR zstd_VERSION_MINOR zstd_VERSION_PATCH)
+file(READ ${LIBRARY_DIR}/zstd.h CONTENT)  # Read file content
+
+string(REGEX MATCH ".*define ZSTD_VERSION_MAJOR *([0-9]+).*define ZSTD_VERSION_MINOR *([0-9]+).*define ZSTD_VERSION_RELEASE *([0-9]+)" VERSION_REGEX "${CONTENT}")
+set(zstd_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE)
+set(zstd_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE)
+set(zstd_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE)

 enable_language(ASM)

 #-----------------------------------------------------------------------------
 # Add extra compilation flags
 #-----------------------------------------------------------------------------
-include(AddZstdCompilationFlags)
-ADD_ZSTD_COMPILATION_FLAGS()
+function (add_zstd_compilation_flags _target)
+	if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW)
+		if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC)
+			# clang-cl normally maps -Wall to -Weverything.
+			target_compile_options(${_target} PRIVATE "/clang:-Wall")
+		else()
+			target_compile_options(${_target} PRIVATE -Wall)
+		endif()
+		target_compile_options(${_target} PRIVATE -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual)
+		target_compile_options(${_target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wstrict-prototypes>)
+		# Enable asserts in Debug mode
+		if (CMAKE_BUILD_TYPE MATCHES "Debug")
+			target_compile_options(${_target} PRIVATE DEBUGLEVEL=1)
+		endif()
+		# Add noexecstack flags
+		target_link_options(${_target} PRIVATE -z noexecstack)  # LDFLAGS
+		target_compile_options(${_target} PRIVATE -Qunused-arguments -Wa,--noexecstack)  # CFLAGS & CXXFLAGS
+	elseif (MSVC)
+		set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate multi-threaded compilation (/MP flag)")
+		if (CMAKE_GENERATOR MATCHES "Visual Studio" AND ACTIVATE_MULTITHREADED_COMPILATION)
+			target_compile_options(${_target} PRIVATE "/MP")
+		endif ()
+		# UNICODE SUPPORT
+		target_compile_definitions(${_target} PRIVATE _UNICODE UNICODE)
+		# Enable asserts in Debug mode
+		if (CMAKE_BUILD_TYPE MATCHES "Debug")
+			target_compile_definitions(${_target} PRIVATE DEBUGLEVEL=1)
+		endif()
+	endif()
+endfunction()

 # Legacy support
 option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" ON)
@@ -95,36 +125,27 @@ endif()
 # macros.
 set_source_files_properties(${Sources} PROPERTIES LANGUAGE C)

-# Split project to static and shared libraries build
-set(library_targets)
-add_library(libzstd_shared SHARED ${Sources} ${Headers} ${PlatformDependResources})
-add_library(zstd::shared ALIAS libzstd_shared)
-list(APPEND library_targets libzstd_shared)
-
 add_library(libzstd_static STATIC ${Sources} ${Headers})
 add_library(zstd::static ALIAS libzstd_static)
-list(APPEND library_targets libzstd_static)

-foreach (LIB ${library_targets})
-	# Define library directory, where sources and header files are located
-	target_include_directories(${LIB} PUBLIC ${LIBRARY_DIR})
-	target_include_directories(${LIB} PRIVATE ${LIBRARY_DIR}/common)
+add_zstd_compilation_flags(libzstd_static)

-	if (ZSTD_LEGACY_SUPPORT)
-		include_directories(${LIBRARY_LEGACY_DIR})
-		target_compile_definitions(${LIB} PRIVATE ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_LEVEL})
-	else()
-		target_compile_definitions(${LIB} PRIVATE ZSTD_LEGACY_SUPPORT=0)
-	endif()
-endforeach()
+# Define library directory, where sources and header files are located
+target_include_directories(libzstd_static PUBLIC ${LIBRARY_DIR})
+target_include_directories(libzstd_static PRIVATE ${LIBRARY_DIR}/common)
+
+if (ZSTD_LEGACY_SUPPORT)
+	include_directories(${LIBRARY_LEGACY_DIR})
+	target_compile_definitions(libzstd_static PRIVATE ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_LEVEL})
+else()
+	target_compile_definitions(libzstd_static PRIVATE ZSTD_LEGACY_SUPPORT=0)
+endif()

 if (ZSTD_MULTITHREAD_SUPPORT)
-	target_compile_definitions(libzstd_shared PRIVATE ZSTD_MULTITHREAD)
 	target_compile_definitions(libzstd_static PRIVATE ZSTD_MULTITHREAD)
 	if (UNIX)
 		set(THREADS_PREFER_PTHREAD_FLAG ON)
 		find_package(Threads REQUIRED)
-		target_link_libraries(libzstd_shared Threads::Threads)
 		target_link_libraries(libzstd_static Threads::Threads)
 		if (NOT CMAKE_USE_PTHREADS_INIT)
 			message(SEND_ERROR "ZSTD currently does not support thread libraries other than pthreads")
@@ -135,16 +156,10 @@ endif()
 # Add specific compile definitions for MSVC project
 if (MSVC)
 	set(COMMON_DEFINITIONS ZSTD_DISABLE_ASM _CRT_SECURE_NO_WARNINGS)
-	target_compile_definitions(libzstd_shared PRIVATE ZSTD_DLL_EXPORT=1 ZSTD_HEAPMODE=0 _CONSOLE ${COMMON_DEFINITIONS})
 	target_compile_definitions(libzstd_static PRIVATE ZSTD_HEAPMODE=0 ${COMMON_DEFINITIONS})
 endif()

-# Define static and shared library names
-set_target_properties(libzstd_shared PROPERTIES
-	OUTPUT_NAME zstd
-	VERSION ${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}
-	SOVERSION ${zstd_VERSION_MAJOR})
-
+# Define static library names
 set_property(TARGET libzstd_static PROPERTY POSITION_INDEPENDENT_CODE ON)

 # With MSVC static library needs to be renamed to avoid conflict with import library
--- a/ext/zstd/CMakeModules/AddZstdCompilationFlags.cmake
+++ b/ext/zstd/CMakeModules/AddZstdCompilationFlags.cmake
@@ -1,121 +0,0 @@
-include(CheckCXXCompilerFlag)
-include(CheckCCompilerFlag)
-# VERSION_GREATER_EQUAL requires CMake 3.7 or later.
-# https://cmake.org/cmake/help/latest/command/if.html#version-greater-equal
-if (CMAKE_VERSION VERSION_LESS 3.18)
-    set(ZSTD_HAVE_CHECK_LINKER_FLAG false)
-else ()
-    set(ZSTD_HAVE_CHECK_LINKER_FLAG true)
-endif ()
-if (ZSTD_HAVE_CHECK_LINKER_FLAG)
-    include(CheckLinkerFlag)
-endif()
-
-function(EnableCompilerFlag _flag _C _CXX _LD)
-    string(REGEX REPLACE "\\+" "PLUS" varname "${_flag}")
-    string(REGEX REPLACE "[^A-Za-z0-9]+" "_" varname "${varname}")
-    string(REGEX REPLACE "^_+" "" varname "${varname}")
-    string(TOUPPER "${varname}" varname)
-    if (_C)
-        CHECK_C_COMPILER_FLAG(${_flag} C_FLAG_${varname})
-        if (C_FLAG_${varname})
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flag}" PARENT_SCOPE)
-        endif ()
-    endif ()
-    if (_CXX)
-        CHECK_CXX_COMPILER_FLAG(${_flag} CXX_FLAG_${varname})
-        if (CXX_FLAG_${varname})
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flag}" PARENT_SCOPE)
-        endif ()
-    endif ()
-    if (_LD)
-        # We never add a linker flag with CMake < 3.18. We will
-        # implement CHECK_LINKER_FLAG() like feature for CMake < 3.18
-        # or require CMake >= 3.18 when we need to add a required
-        # linker flag in future.
-        #
-        # We also skip linker flags check for MSVC compilers (which includes
-        # clang-cl) since currently check_linker_flag() doesn't give correct
-        # results for this configuration,
-        # see: https://gitlab.kitware.com/cmake/cmake/-/issues/22023
-        if (ZSTD_HAVE_CHECK_LINKER_FLAG AND NOT MSVC)
-            CHECK_LINKER_FLAG(C ${_flag} LD_FLAG_${varname})
-        else ()
-            set(LD_FLAG_${varname} false)
-        endif ()
-        if (LD_FLAG_${varname})
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${_flag}" PARENT_SCOPE)
-            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${_flag}" PARENT_SCOPE)
-        endif ()
-    endif ()
-endfunction()
-
-macro(ADD_ZSTD_COMPILATION_FLAGS)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) #Not only UNIX but also WIN32 for MinGW
-        # It's possible to select the exact standard used for compilation.
-        # It's not necessary, but can be employed for specific purposes.
-        # Note that zstd source code is compatible with both C++98 and above
-        # and C-gnu90 (c90 + long long + variadic macros ) and above
-        # EnableCompilerFlag("-std=c++11" false true) # Set C++ compilation to c++11 standard
-        # EnableCompilerFlag("-std=c99" true false)   # Set C compiation to c99 standard
-        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC)
-            # clang-cl normally maps -Wall to -Weverything.
-            EnableCompilerFlag("/clang:-Wall" true true false)
-        else ()
-            EnableCompilerFlag("-Wall" true true false)
-        endif ()
-        EnableCompilerFlag("-Wextra" true true false)
-        EnableCompilerFlag("-Wundef" true true false)
-        EnableCompilerFlag("-Wshadow" true true false)
-        EnableCompilerFlag("-Wcast-align" true true false)
-        EnableCompilerFlag("-Wcast-qual" true true false)
-        EnableCompilerFlag("-Wstrict-prototypes" true false false)
-        # Enable asserts in Debug mode
-        if (CMAKE_BUILD_TYPE MATCHES "Debug")
-            EnableCompilerFlag("-DDEBUGLEVEL=1" true true false)
-        endif ()
-        # Add noexecstack flags
-        # LDFLAGS
-        EnableCompilerFlag("-z noexecstack" false false true)
-        # CFLAGS & CXXFLAGS
-        EnableCompilerFlag("-Qunused-arguments" true true false)
-        EnableCompilerFlag("-Wa,--noexecstack" true true false)
-    elseif (MSVC) # Add specific compilation flags for Windows Visual
-
-        set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate multi-threaded compilation (/MP flag)")
-        if (CMAKE_GENERATOR MATCHES "Visual Studio" AND ACTIVATE_MULTITHREADED_COMPILATION)
-            EnableCompilerFlag("/MP" true true false)
-        endif ()
-
-        # UNICODE SUPPORT
-        EnableCompilerFlag("/D_UNICODE" true true false)
-        EnableCompilerFlag("/DUNICODE" true true false)
-        # Enable asserts in Debug mode
-        if (CMAKE_BUILD_TYPE MATCHES "Debug")
-            EnableCompilerFlag("/DDEBUGLEVEL=1" true true false)
-        endif ()
-    endif ()
-
-    # Remove duplicates compilation flags
-    foreach (flag_var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-             CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-             CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-             CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-        if( ${flag_var} )
-            separate_arguments(${flag_var})
-            string(REPLACE ";" " " ${flag_var} "${${flag_var}}")
-        endif()
-    endforeach ()
-
-    if (MSVC AND ZSTD_USE_STATIC_RUNTIME)
-        foreach (flag_var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-                 CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-                 CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-                 CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-            if ( ${flag_var} )
-                string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-            endif()
-        endforeach ()
-    endif ()
-
-endmacro()
--- a/ext/zstd/CMakeModules/GetZstdLibraryVersion.cmake
+++ b/ext/zstd/CMakeModules/GetZstdLibraryVersion.cmake
@@ -1,10 +0,0 @@
-function(GetZstdLibraryVersion _header _major _minor _patch)
-    # Read file content
-    file(READ ${_header} CONTENT)
-
-    string(REGEX MATCH ".*define ZSTD_VERSION_MAJOR *([0-9]+).*define ZSTD_VERSION_MINOR *([0-9]+).*define ZSTD_VERSION_RELEASE *([0-9]+)" VERSION_REGEX "${CONTENT}")
-    set(${_major} ${CMAKE_MATCH_1} PARENT_SCOPE)
-    set(${_minor} ${CMAKE_MATCH_2} PARENT_SCOPE)
-    set(${_patch} ${CMAKE_MATCH_3} PARENT_SCOPE)
-endfunction()
-