|
 |
dfa78ec |
From 1ab26639c071deda00bb8661f0cd02eaada31a33 Mon Sep 17 00:00:00 2001
|
|
|
7606b92 |
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan[at]danny.cz>
|
|
|
7606b92 |
Date: Wed, 18 Jan 2012 20:39:05 +0100
|
|
|
dfa78ec |
Subject: [PATCH 1/7] use system zlib if available
|
|
|
7606b92 |
|
|
|
7606b92 |
---
|
|
|
dfa78ec |
CMakeLists.txt | 7 ++++++-
|
|
|
dfa78ec |
src/zipios/CMakeLists.txt | 15 ++++++++++++---
|
|
|
7606b92 |
2 files changed, 18 insertions(+), 4 deletions(-)
|
|
|
7606b92 |
|
|
|
7606b92 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
dfa78ec |
index 094c4f7..e857040 100644
|
|
|
7606b92 |
--- a/CMakeLists.txt
|
|
|
7606b92 |
+++ b/CMakeLists.txt
|
|
|
dfa78ec |
@@ -40,6 +40,8 @@ set( CMAKE_OSX_DEPLOYMENT_TARGET "10.9" )
|
|
|
dfa78ec |
# set( CMAKE_OSX_ARCHITECTURES "i386;x86_64" )
|
|
|
7606b92 |
|
|
|
dfa78ec |
|
|
|
dfa78ec |
+find_package( ZLIB )
|
|
|
dfa78ec |
+
|
|
|
7606b92 |
# The parsing order is significant!
|
|
|
dfa78ec |
|
|
|
7606b92 |
add_subdirectory( src/BoostParts )
|
|
|
dfa78ec |
@@ -61,7 +63,10 @@ add_subdirectory( src/XercesExtensions )
|
|
|
dfa78ec |
set( XERCESEXTENSIONS_LIBRARIES XercesExtensions )
|
|
|
dfa78ec |
set( XERCESEXTENSIONS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/XercesExtensions )
|
|
|
dfa78ec |
|
|
|
7606b92 |
-add_subdirectory( src/zlib )
|
|
|
dfa78ec |
+if( NOT ZLIB_FOUND )
|
|
|
dfa78ec |
+ add_subdirectory( src/zlib )
|
|
|
dfa78ec |
+endif()
|
|
|
dfa78ec |
+
|
|
|
7606b92 |
add_subdirectory( src/zipios )
|
|
|
7606b92 |
add_subdirectory( src/googlemock )
|
|
|
dfa78ec |
|
|
|
7606b92 |
diff --git a/src/zipios/CMakeLists.txt b/src/zipios/CMakeLists.txt
|
|
|
dfa78ec |
index 88fdb7d..0d41f42 100644
|
|
|
7606b92 |
--- a/src/zipios/CMakeLists.txt
|
|
|
7606b92 |
+++ b/src/zipios/CMakeLists.txt
|
|
|
dfa78ec |
@@ -17,15 +17,24 @@ file( GLOB_RECURSE SOURCES *.cpp *.h )
|
|
|
7606b92 |
# and the headers for the linked-to libraries
|
|
|
7606b92 |
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
7606b92 |
${BoostParts_SOURCE_DIR}
|
|
|
7606b92 |
- ${zlib_SOURCE_DIR}
|
|
|
7606b92 |
- ${zlib_BINARY_DIR}
|
|
|
7606b92 |
)
|
|
|
7606b92 |
|
|
|
dfa78ec |
+if( ZLIB_FOUND )
|
|
|
dfa78ec |
+ include_directories( ${ZLIB_INCLUDE_DIRS} )
|
|
|
dfa78ec |
+else()
|
|
|
dfa78ec |
+ include_directories( ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} )
|
|
|
dfa78ec |
+endif()
|
|
|
dfa78ec |
+
|
|
|
7606b92 |
link_directories ( ${PROJECT_BINARY_DIR}/lib )
|
|
|
7606b92 |
|
|
|
7606b92 |
add_library( ${PROJECT_NAME} ${SOURCES} )
|
|
|
7606b92 |
|
|
|
7606b92 |
-target_link_libraries( ${PROJECT_NAME} zlib BoostParts )
|
|
|
dfa78ec |
+target_link_libraries( ${PROJECT_NAME} BoostParts )
|
|
|
dfa78ec |
+if( ZLIB_FOUND )
|
|
|
dfa78ec |
+ target_link_libraries( ${PROJECT_NAME} ${ZLIB_LIBRARIES} )
|
|
|
dfa78ec |
+else()
|
|
|
dfa78ec |
+ target_link_libraries( ${PROJECT_NAME} zlib )
|
|
|
dfa78ec |
+endif()
|
|
|
7606b92 |
|
|
|
7606b92 |
#############################################################################
|
|
|
7606b92 |
|
|
|
7606b92 |
--
|
|
|
dfa78ec |
2.7.1
|
|
|
7606b92 |
|