WIP: fixed build issue with MJ2 option ON with new framework

[openjpeg.git] / applications / mj2 / CMakeLists.txt

diff --git a/applications/mj2/CMakeLists.txt b/applications/mj2/CMakeLists.txt
index 7b365678fd1b802bd756568e0ee1dd0b57961e5e..e96ada3c1d35b0991208c5cf489f52b475f87b57 100644 (file)
--- a/applications/mj2/CMakeLists.txt
+++ b/applications/mj2/CMakeLists.txt
@@ -1,9 +1,6 @@
 # Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
 
-SET(common_SRCS "")
-IF(DONT_HAVE_GETOPT)
-  SET(common_SRCS ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c)
-ENDIF(DONT_HAVE_GETOPT)
+SET(common_SRCS ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
 
 # While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
 SET(OPJ_SRCS
@@ -25,6 +22,12 @@ ${OPENJPEG_SOURCE_DIR}/libopenjpeg/t1.c
 ${OPENJPEG_SOURCE_DIR}/libopenjpeg/t2.c
 ${OPENJPEG_SOURCE_DIR}/libopenjpeg/tcd.c
 ${OPENJPEG_SOURCE_DIR}/libopenjpeg/tgt.c
+${OPENJPEG_SOURCE_DIR}/libopenjpeg/cidx_manager.c
+${OPENJPEG_SOURCE_DIR}/libopenjpeg/phix_manager.c
+${OPENJPEG_SOURCE_DIR}/libopenjpeg/ppix_manager.c
+${OPENJPEG_SOURCE_DIR}/libopenjpeg/thix_manager.c
+${OPENJPEG_SOURCE_DIR}/libopenjpeg/tpix_manager.c
+${OPENJPEG_SOURCE_DIR}/libopenjpeg/function_list.c
 )
 
 SET(MJ2_SRCS mj2.c mj2_convert.c)
@@ -46,9 +49,8 @@ ADD_EXECUTABLE(frames_to_mj2
   ${OPJ_SRCS}
   ${MJ2_SRCS}
   )
-IF(LCMS_FOUND OR LCMS2_FOUND)
-  TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIBNAME})
-ENDIF(LCMS_FOUND OR LCMS2_FOUND)
+TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIBNAME})
+
 IF(UNIX)
   TARGET_LINK_LIBRARIES(frames_to_mj2 m)
 ENDIF(UNIX)
@@ -60,9 +62,8 @@ ADD_EXECUTABLE(mj2_to_frames
     ${MJ2_SRCS}
     ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
     )
-IF(LCMS_FOUND OR LCMS2_FOUND)
-  TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIBNAME})
-ENDIF(LCMS_FOUND OR LCMS2_FOUND)
+TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIBNAME})
+
 IF(UNIX)
   TARGET_LINK_LIBRARIES(mj2_to_frames m)
 ENDIF(UNIX)
@@ -72,9 +73,8 @@ ADD_EXECUTABLE(extract_j2k_from_mj2
     ${OPJ_SRCS}
     ${MJ2_SRCS}
     )
-IF(LCMS_FOUND OR LCMS2_FOUND)
-  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIBNAME})
-ENDIF(LCMS_FOUND OR LCMS2_FOUND)
+TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIBNAME})
+
 IF(UNIX)
   TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
 ENDIF(UNIX)
@@ -84,9 +84,8 @@ ADD_EXECUTABLE(wrap_j2k_in_mj2
     ${OPJ_SRCS}
     ${MJ2_SRCS}
     )
-IF(LCMS_FOUND OR LCMS2_FOUND)
-  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIBNAME})
-ENDIF(LCMS_FOUND OR LCMS2_FOUND)
+TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIBNAME})
+
 IF(UNIX)
   TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
 ENDIF(UNIX)