walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Antonin Descampe 2011-03-21 21:22:33 +00:00
parent 19f9147e10
commit 279b67c838
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -347,7 +347,7 @@ ENDIF()
#------------------------------------------------------------- #-------------------------------------------------------------
OPTION(BUILD_THIRDPARTY "Build the thirdparty executables" ON) 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) IF(BUILD_THIRDPARTY)
SET(HAVE_ZLIB_H 1) SET(HAVE_ZLIB_H 1)
SET(HAVE_LIBZ 1) SET(HAVE_LIBZ 1)
@ -388,7 +388,7 @@ ENDIF()
ENDIF(NOT TIFF_FOUND) ENDIF(NOT TIFF_FOUND)
# #
ENDIF(BUILD_THIRDPARTY) 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) ENDIF(BUILD_CODEC OR BUILD_JPWL OR BUILD_MJ2)
# #