fixed a bug that created a conflict between liblcms on the system and liblcms2 in...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f471cb4813e5eef7006ced8bc2794ea1917ca5dc..93c74add49341f7181bfb7bef9567e7dee420f2c 100644 (file)
--- 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)
 #