added tid request support to JPIP client and JPIP server quit request

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

diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt
index 1a25d3101fc0ab07ce0d9c9ce2241fe8e40ab9cf..8c1d3c25ac9414b7aa16dd85b5333d39dafb43c1 100644 (file)
--- a/applications/codec/CMakeLists.txt
+++ b/applications/codec/CMakeLists.txt
@@ -1,4 +1,4 @@
-  # Build the demo app, small examples
+# Build the demo app, small examples
 
 # First thing define the common source:
 SET(common_SRCS
@@ -37,15 +37,8 @@ ENDIF(WIN32)
 FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
   TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} 
-${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} )
 
-  IF(LCMS_FOUND OR LCMS2_FOUND)
-    TARGET_LINK_LIBRARIES(${exe} ${LCMS_LIBNAME})
-  ENDIF(LCMS_FOUND OR LCMS2_FOUND)
-
-  ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
-  # calling those exe without option will make them fail always:
-  SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
   # On unix you need to link to the math library:
   IF(UNIX)
     TARGET_LINK_LIBRARIES(${exe} m)
@@ -103,40 +96,4 @@ IF(BUILD_JPWL)
   INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
   )
-ENDIF(BUILD_JPWL)
-
-if(BUILD_TESTING)
-# Do testing here, once we know the examples are being built:
-FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB
-  "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k"
-  "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c"
-  "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2"
-  )
-
-foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB})
-  get_filename_component(filename_temp ${filename} NAME)
-  get_filename_component(filename_ext ${filename} EXT)
-  execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}
-    OUTPUT_VARIABLE dump_success
-    OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump
-    ERROR_QUIET
-  )
-  if(dump_success)
-  file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file)
-  string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1"
-    numcomps "${numcomp_file}")
-  #message( "found:${output_variable} for ${filename_temp}" )
-  endif()
-  ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename})
-  foreach(codec_type ppm pgx bmp tif raw tga png)
-    ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type})
-  endforeach(codec_type)
-  foreach(codec_type ppm bmp tif tga png)
-    ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext})
-    SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type})
-    #if(UNIX)
-    #  ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext})
-    #endif(UNIX)
-  endforeach(codec_type)
-endforeach(filename)
-endif(BUILD_TESTING)
+ENDIF(BUILD_JPWL)
\ No newline at end of file