Removed the libs directory containing win32 compiled versions of libpng, libtiff...

[openjpeg.git] / mj2 / CMakeLists.txt

diff --git a/mj2/CMakeLists.txt b/mj2/CMakeLists.txt
index f7ea0e2e23ecc2f3d3f12a385343208fc63d44cb..6fd63dde5146ab7ea31a366002a84562bcf3e698 100644 (file)
--- a/mj2/CMakeLists.txt
+++ b/mj2/CMakeLists.txt
@@ -37,7 +37,7 @@ ENDIF(WIN32)
 INCLUDE_DIRECTORIES(
   ${OPENJPEG_SOURCE_DIR}/libopenjpeg
   ${OPENJPEG_SOURCE_DIR}/common
-  ${LCMS_INCLUDE_DIR}
+  ${LCMS_INCLUDE_DIRNAME}
   )
 
 ADD_EXECUTABLE(frames_to_mj2
@@ -46,7 +46,9 @@ ADD_EXECUTABLE(frames_to_mj2
   ${OPJ_SRCS}
   ${MJ2_SRCS}
   )
-TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIB})
+IF(LCMS_FOUND OR LCMS2_FOUND)
+  TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIBNAME})
+ENDIF(LCMS_FOUND OR LCMS2_FOUND)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(frames_to_mj2 m)
 ENDIF(UNIX)
@@ -58,7 +60,9 @@ ADD_EXECUTABLE(mj2_to_frames
     ${MJ2_SRCS}
     ${OPENJPEG_SOURCE_DIR}/common/color.c
     )
-TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIB})
+IF(LCMS_FOUND OR LCMS2_FOUND)
+  TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIBNAME})
+ENDIF(LCMS_FOUND OR LCMS2_FOUND)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(mj2_to_frames m)
 ENDIF(UNIX)
@@ -68,7 +72,9 @@ ADD_EXECUTABLE(extract_j2k_from_mj2
     ${OPJ_SRCS}
     ${MJ2_SRCS}
     )
-TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIB})
+IF(LCMS_FOUND OR LCMS2_FOUND)
+  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIBNAME})
+ENDIF(LCMS_FOUND OR LCMS2_FOUND)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
 ENDIF(UNIX)
@@ -78,7 +84,9 @@ ADD_EXECUTABLE(wrap_j2k_in_mj2
     ${OPJ_SRCS}
     ${MJ2_SRCS}
     )
-TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIB})
+IF(LCMS_FOUND OR LCMS2_FOUND)
+  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIBNAME})
+ENDIF(LCMS_FOUND OR LCMS2_FOUND)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
 ENDIF(UNIX)