From 6628a10f148d973a713b5fac63006a06aef1af27 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Sun, 1 Dec 2024 08:53:27 +0100 Subject: [PATCH] CMake: Move versionscript block to zlib definition. --- CMakeLists.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf6193cb..9c8630ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,11 @@ if(ZLIB_BUILD_SHARED) SOVERSION 1 PROPERTIES OUTPUT_NAME z PROPERTIES OUTPUT_NAME_DEBUG z${zlib_debug_suffix}) + if(UNIX AND NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) + # On unix-like platforms the library is almost always called libz + set_target_properties(zlib PROPERTIES + LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif(UNIX AND NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) endif(ZLIB_BUILD_SHARED) if(ZLIB_BUILD_STATIC) @@ -188,16 +193,6 @@ if(NOT CYGWIN AND ZLIB_BUILD_SHARED) set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) endif() -if(UNIX) - # On unix-like platforms the library is almost always called libz - if(ZLIB_BUILD_SHARED) - if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) - set_target_properties(zlib PROPERTIES - LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() - endif(ZLIB_BUILD_SHARED) -endif() - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) if(ZLIB_BUILD_SHARED) install(TARGETS zlib