geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adon...@apache.org
Subject geode git commit: GEODE-2319: In order to fix the build on Ubuntu, remove linking of libz from libcppcache and moved it to libxml2 in dependency section. This closes #344
Date Sun, 22 Jan 2017 14:29:03 GMT
Repository: geode
Updated Branches:
  refs/heads/next-gen-native-client-software-grant 03781bd1c -> e92cb631c


GEODE-2319: In order to fix the build on Ubuntu, remove linking of libz from libcppcache and
moved it to libxml2 in dependency section.
This closes #344


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e92cb631
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e92cb631
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e92cb631

Branch: refs/heads/next-gen-native-client-software-grant
Commit: e92cb631cb0897c73468b54564340c51002ba697
Parents: 03781bd
Author: adongre <adongre@apache.org>
Authored: Sun Jan 22 19:57:53 2017 +0530
Committer: adongre <adongre@apache.org>
Committed: Sun Jan 22 19:57:53 2017 +0530

----------------------------------------------------------------------
 src/cppcache/src/CMakeLists.txt         | 6 +-----
 src/dependencies/libxml2/CMakeLists.txt | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/e92cb631/src/cppcache/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CMakeLists.txt b/src/cppcache/src/CMakeLists.txt
index 04c51a0..8fa7a7d 100644
--- a/src/cppcache/src/CMakeLists.txt
+++ b/src/cppcache/src/CMakeLists.txt
@@ -78,11 +78,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     set(SOURCES ${SOURCES} $<TARGET_OBJECTS:gfcppasm>)
   endif()
 endif()
-if (${UNIX})
-  target_link_libraries(_gfcppcache INTERFACE
-      z
-  )
-elseif (${WIN32})
+if (${WIN32})
   target_link_libraries(_gfcppcache INTERFACE
       Dbghelp
   )

http://git-wip-us.apache.org/repos/asf/geode/blob/e92cb631/src/dependencies/libxml2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/libxml2/CMakeLists.txt b/src/dependencies/libxml2/CMakeLists.txt
index 7febbca..3df1ec0 100644
--- a/src/dependencies/libxml2/CMakeLists.txt
+++ b/src/dependencies/libxml2/CMakeLists.txt
@@ -62,4 +62,9 @@ target_include_directories(${PROJECT_NAME} INTERFACE
 target_link_libraries(${PROJECT_NAME} INTERFACE
     ${${PROJECT_NAME}_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xml2${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
+if (${UNIX})
+  target_link_libraries(${PROJECT_NAME} INTERFACE
+     z
+  )
+endif()
 add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXTERN})


Mime
View raw message