From 07a260990cbe7afbfa1e5ec1acc1238e2eca5574 Mon Sep 17 00:00:00 2001 From: Daniel Barney Date: Thu, 26 Feb 2015 20:21:08 -0700 Subject: [PATCH 1/2] added fixes for SunOS --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 449237e..b15edad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,7 @@ endif() if(UNIX) # On unix-like platforms the library is almost always called libz set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) + if(NOT APPLE and NOT "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") endif() elseif(BUILD_SHARED_LIBS AND WIN32) From 39c397437028f56ced365952e257ec56971de84e Mon Sep 17 00:00:00 2001 From: Daniel Barney Date: Fri, 27 Feb 2015 08:31:27 -0700 Subject: [PATCH 2/2] fixed syntax error --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b15edad..232b4d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,7 @@ endif() if(UNIX) # On unix-like platforms the library is almost always called libz set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) - if(NOT APPLE and NOT "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") + if(NOT APPLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") endif() elseif(BUILD_SHARED_LIBS AND WIN32)