diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | applications/mj2/CMakeLists.txt | 20 |
2 files changed, 9 insertions, 12 deletions
@@ -8,6 +8,7 @@ What's New for OpenJPEG July 29, 2011 ! [mickael] solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall) ! [mickael] increase number of warning reported on the dashboard (forgot the file in the last commit) +! [mickael] update MJ2 CMakeLists regards to the new thirdparty strategy July 27, 2011 ! [mickael] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests. diff --git a/applications/mj2/CMakeLists.txt b/applications/mj2/CMakeLists.txt index 7b365678..4a43886f 100644 --- a/applications/mj2/CMakeLists.txt +++ b/applications/mj2/CMakeLists.txt @@ -46,9 +46,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 +59,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 +70,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 +81,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) |