diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-03-21 21:22:33 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-03-21 21:22:33 +0000 |
| commit | 279b67c838556a0b61f1de5a4a4d06e6375111c5 (patch) | |
| tree | 982fedf7c02f74d8d51b4014b43efa1a21430fbe | |
| parent | 19f9147e1076d83dd1111609ca93a01085dbfb4f (diff) | |
fixed a bug that created a conflict between liblcms on the system and liblcms2 in the thirdparty directory
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f471cb48..93c74add 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,7 +347,7 @@ ENDIF() #------------------------------------------------------------- OPTION(BUILD_THIRDPARTY "Build the thirdparty executables" ON) # - IF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR NOT LCMS_FOUND OR NOT LCMS2_FOUND) + IF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR (NOT LCMS_FOUND AND NOT LCMS2_FOUND)) IF(BUILD_THIRDPARTY) SET(HAVE_ZLIB_H 1) SET(HAVE_LIBZ 1) @@ -388,7 +388,7 @@ ENDIF() ENDIF(NOT TIFF_FOUND) # ENDIF(BUILD_THIRDPARTY) - ENDIF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR NOT LCMS_FOUND OR NOT LCMS2_FOUND) + ENDIF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR (NOT LCMS_FOUND AND NOT LCMS2_FOUND)) # ENDIF(BUILD_CODEC OR BUILD_JPWL OR BUILD_MJ2) # |