[trunk]re-formatted help display in executables

[openjpeg.git] / src / bin / jp2 / CMakeLists.txt

diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index f25b8470c4de1cbb02d225d124ce4eba5b9c2530..4374631743a69204380add3bbaf8a8eb00bc3b52 100644 (file)
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -10,9 +10,11 @@ set(common_SRCS
 
 # Headers file are located here:
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
-  ${LCMS_INCLUDE_DIRNAME}
   ${OPENJPEG_SOURCE_DIR}/src/bin/common
+  ${LCMS_INCLUDE_DIRNAME}
   ${Z_INCLUDE_DIRNAME}
   ${PNG_INCLUDE_DIRNAME}
   ${TIFF_INCLUDE_DIRNAME}
@@ -35,7 +37,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
   # To support universal exe:
   if(ZLIB_FOUND AND APPLE)
     target_link_libraries(${exe} z)
-  ELSe(ZLIB_FOUND AND APPLE)
+  else(ZLIB_FOUND AND APPLE)
     target_link_libraries(${exe} ${Z_LIBNAME})
   endif()
 
@@ -57,57 +59,3 @@ install(
               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
 #
-
-if(BUILD_JPWL)
-  add_executable(JPWL_j2k_to_image
-  j2k_to_image.c
-  ${common_SRCS}
-  )
-
-  set_property(
-     TARGET JPWL_j2k_to_image
-     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
-  )
-
-  target_link_libraries(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
-    ${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-
-  # To support universal exe:
-  if(ZLIB_FOUND AND APPLE)
-    target_link_libraries(JPWL_j2k_to_image z)
-  ELSe(ZLIB_FOUND AND APPLE)
-    target_link_libraries(JPWL_j2k_to_image ${Z_LIBNAME})
-  endif()
-
-  if(UNIX)
-    target_link_libraries(JPWL_j2k_to_image m)
-  endif()
-
-  add_executable(JPWL_image_to_j2k
-  image_to_j2k.c
-  ${common_SRCS}
-  )
-
-  set_property(
-     TARGET JPWL_image_to_j2k
-     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
-  )
-
-  target_link_libraries(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL
-       ${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-       
-  # To support universal exe:
-  if(ZLIB_FOUND AND APPLE)
-    target_link_libraries(JPWL_image_to_j2k z)
-  ELSe(ZLIB_FOUND AND APPLE)
-    target_link_libraries(JPWL_image_to_j2k ${Z_LIBNAME})
-  endif()
-
-  if(UNIX)
-    target_link_libraries(JPWL_image_to_j2k m)
-  endif()
-
-  install(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  )
-endif()