diff options
| author | Chris Dyer <redpony@gmail.com> | 2015-04-08 21:38:37 -0700 |
|---|---|---|
| committer | Chris Dyer <redpony@gmail.com> | 2015-04-08 21:38:37 -0700 |
| commit | d18a8f8495ad4c910660be128c0f6843593f4999 (patch) | |
| tree | 8cf74b2e27c2a16d787aabaeda6b635a6c3b7003 | |
| parent | 3bfdcd7fc797819217928146016579499a2376d4 (diff) | |
| parent | 3599bd55b75d4e2d80401a4f0247a2d757716aae (diff) | |
Merge pull request #72 from redpony/cmake
flags for zlib etc
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | config.h.cmake | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 934c69e6..12e65119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) #### packages find_package(ZLIB REQUIRED) -find_package(BZip2 REQUIRED) +if(ZLIB_FOUND) + set(HAVE_ZLIB 1) +endif(ZLIB_FOUND) +find_package(BZip2) +if(BZIP2_FOUND) + set(HAVE_BZLIB 1) +endif(BZIP2_FOUND) find_package(LibDL REQUIRED) # for pycdec diff --git a/config.h.cmake b/config.h.cmake index aa0a9f4a..b01a1e6d 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -2,5 +2,7 @@ #define CONFIG_H #cmakedefine METEOR_JAR "@METEOR_JAR@" +#cmakedefine HAVE_ZLIB @HAVE_ZLIB@ +#cmakedefine HAVE_BZLIB @HAVE_BZLIB@ #endif // CONFIG_H |