[trunk] Add some sanity checks when reading Ippm(i) segments

[openjpeg.git] / src / lib / openjp2 / CMakeLists.txt

diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 8739ccaa7221f7dbb20bb9f8506dbd24cb8263f0..5c87f29771cecb3710ed50feaaf7137d83f503f9 100644 (file)
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -1,20 +1,12 @@
 include_regular_expression("^.*$")
 
-#-----------------------------------------------------------------------------
-# opj_config.h generation (2/2)
-configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/opj_config.h.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
- @ONLY
- )
 #
 install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
 
 include_directories(
-  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
 )
-
 # Defines the source code for the library
 set(OPENJPEG_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/bio.c
@@ -22,26 +14,32 @@ set(OPENJPEG_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/dwt.c
   ${CMAKE_CURRENT_SOURCE_DIR}/event.c
   ${CMAKE_CURRENT_SOURCE_DIR}/image.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/invert.c
   ${CMAKE_CURRENT_SOURCE_DIR}/j2k.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/j2k_lib.c
   ${CMAKE_CURRENT_SOURCE_DIR}/jp2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/jpt.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mct.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mqc.c
   ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/opj_clock.c
   ${CMAKE_CURRENT_SOURCE_DIR}/pi.c
   ${CMAKE_CURRENT_SOURCE_DIR}/raw.c
   ${CMAKE_CURRENT_SOURCE_DIR}/t1.c
   ${CMAKE_CURRENT_SOURCE_DIR}/t2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/tcd.c
   ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
   ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c
 )
+if(BUILD_JPIP)
+  add_definitions(-DUSE_JPIP)
+  set(OPENJPEG_SRCS
+    ${OPENJPEG_SRCS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
+  )
+endif()
 
 # Build the library
 if(WIN32)
@@ -72,9 +70,16 @@ install(FILES openjpeg.h opj_stdint.h
 
 # install man page of the library
 install(
-  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjpeg.3
+  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
 
+# internal utilities to generate t1_luts.h (part of the jp2 lib)
+# no need to install:
+add_executable(t1_generate_luts t1_generate_luts.c)
+if(UNIX)
+  target_link_libraries(t1_generate_luts m)
+endif()
+
 # Experimental option; let's how cppcheck performs
 # Implementation details:
 # I could not figure out how to easily upload a file to CDash. Instead simply