123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- From 0c64e33bc2e4e7c011f5a64f5d9c7571a434cc86 Mon Sep 17 00:00:00 2001
- From: tamasmeszaros <meszaros.q@gmail.com>
- Date: Sat, 16 Nov 2019 13:43:17 +0100
- Subject: [PATCH] Respect BUILD_SHARED_LIBS
- ---
- CMakeLists.txt | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 0fe939d..01dfea1 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -183,10 +183,12 @@ if(MINGW)
- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
- endif(MINGW)
-
- -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
- -add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
- -set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
- -set_target_properties(zlib PROPERTIES SOVERSION 1)
- +add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
- +if (BUILD_SHARED_LIBS)
- + target_sources(zlib PRIVATE ${ZLIB_DLL_SRCS})
- + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
- + set_target_properties(zlib PROPERTIES SOVERSION 1)
- +endif()
-
- if(NOT CYGWIN)
- # This property causes shared libraries on Linux to have the full version
- @@ -201,7 +203,7 @@ endif()
-
- if(UNIX)
- # On unix-like platforms the library is almost always called libz
- - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
- + set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
- if(NOT APPLE)
- set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
- endif()
- @@ -211,7 +213,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
- endif()
-
- if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
- - install(TARGETS zlib zlibstatic
- + install(TARGETS zlib
- RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
- --
- 2.16.2.windows.1
|