zlib should build on nonwindows now
This commit is contained in:
parent
1054c18ba9
commit
9eb09be03b
|
@ -165,10 +165,11 @@ endif()
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
# On unix-like platforms the library is almost always called libz
|
# On unix-like platforms the library is almost always called libz
|
||||||
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
|
#set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
|
||||||
if(NOT APPLE)
|
set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z)
|
||||||
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
|
#if(NOT APPLE)
|
||||||
endif()
|
# set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
|
||||||
|
#endif()
|
||||||
elseif(BUILD_SHARED_LIBS AND WIN32)
|
elseif(BUILD_SHARED_LIBS AND WIN32)
|
||||||
# Creates zlib1.dll when building shared library version
|
# Creates zlib1.dll when building shared library version
|
||||||
set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
|
set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
|
||||||
|
|
Loading…
Reference in New Issue