diff options
| author | Pierre Ossman <ossman@cendio.se> | 2011-03-03 09:44:49 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2011-03-03 09:44:49 +0000 |
| commit | a7769f2eee1a93b3b8ef2b7daa7463e0a389338e (patch) | |
| tree | 5086473835cdda4c9c33a5b0da359f659047ba11 /common | |
| parent | c21ddafe5d2bbcdfc8b30d9c2cfb3f261a321cce (diff) | |
| download | tigervnc-a7769f2eee1a93b3b8ef2b7daa7463e0a389338e.tar.gz tigervnc-a7769f2eee1a93b3b8ef2b7daa7463e0a389338e.zip | |
Use the system copy of zlib by default, like we do with autotools.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4313 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common')
| -rw-r--r-- | common/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | common/rdr/CMakeLists.txt | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 145dfdad..59dff7b7 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,5 +1,11 @@ +if(USE_INCLUDED_ZLIB) + add_subdirectory(zlib) + + set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/common/zlib) + set(ZLIB_LIBRARIES zlib) +endif() + add_subdirectory(os) -add_subdirectory(zlib) add_subdirectory(rdr) add_subdirectory(network) add_subdirectory(Xregion) diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt index 98a88d29..78033e2d 100644 --- a/common/rdr/CMakeLists.txt +++ b/common/rdr/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/common/zlib) +include_directories(${CMAKE_SOURCE_DIR}/common ${ZLIB_INCLUDE_DIRS}) add_library(rdr STATIC Exception.cxx @@ -14,7 +14,7 @@ add_library(rdr STATIC ZlibInStream.cxx ZlibOutStream.cxx) -set(RDR_LIBRARIES zlib os) +set(RDR_LIBRARIES ${ZLIB_LIBRARIES} os) if(GNUTLS_FOUND) set(RDR_LIBRARIES ${RDR_LIBRARIES} ${GNUTLS_LIBRARIES} ws2_32) endif() |