diff options
| author | Antonin Descampe <antonin@gmail.com> | 2012-01-25 16:30:03 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2012-01-25 16:30:03 +0000 |
| commit | 040c9a68b685facb6e36751d1ff07b21cc8ded6d (patch) | |
| tree | 562eb0f8baa6c59dc55fdc1478d45286094760df /thirdparty | |
| parent | 2b746a71cb09b9322505b27e2134c868e39067cd (diff) | |
[1.5] remove pthread dependency in JPIP client and tweak thirdparty stuff
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 78abffbe..7ab24ba3 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,5 +1,7 @@ # 3rd party libs +#------------ +# Try to find lib Z IF(BUILD_THIRDPARTY) # Try to build it message(STATUS "We will build Z lib from thirdparty") @@ -8,6 +10,8 @@ IF(BUILD_THIRDPARTY) SET(Z_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include PARENT_SCOPE) SET(ZLIB_FOUND 1) ELSE (BUILD_THIRDPARTY) + # Try to find lib Z + FIND_PACKAGE(ZLIB) IF(ZLIB_FOUND) SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE) SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) @@ -19,7 +23,7 @@ ENDIF(BUILD_THIRDPARTY) #------------ -# Try to find lib PNG (which depends to zlib) +# Try to find lib PNG (which depends on zlib) IF(BUILD_THIRDPARTY) # Try to build it message(STATUS "We will build PNG lib from thirdparty") |