[trunk] Import changes from 1.5 branch

diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt
index 4f449758f27c9a67ef9088a710e00dae2a42c5cd..2f2410dca9e63f00232f8434cc4a45b6120ae19b 100644 (file)
--- a/applications/jpip/util/CMakeLists.txt
+++ b/applications/jpip/util/CMakeLists.txt
@@ -1,10 +1,18 @@
 # Headers file are located here:
 INCLUDE_DIRECTORIES(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg # opj_stdint.h
   ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip
   ${FCGI_INCLUDE_DIRS}
 )
 
+# Tool to embed metadata into JP2 file
+ADD_EXECUTABLE(addXMLinJP2 addXMLinJP2.c)
+# Install exe
+INSTALL(TARGETS addXMLinJP2
+  EXPORT OpenJPEGTargets
+  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+  )
+
 IF(BUILD_JPIP_SERVER)
   
   SET(OPJ_SERVER_SRCS
@@ -78,6 +86,10 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
     COMMENT "building opj_viewer.jar"
     )
 
+  INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
+    DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
+    )
+
   # 2. opj_viewer_xerces
   # search for package org.apache.xerces.parsers
   find_file(APACHE_XERCES_JAR
@@ -128,6 +140,10 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
       DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
       COMMENT "building opj_viewer_xerces.jar"
       )
+
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
+      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
+      )
   endif()
 else(Java_Development_FOUND)
   message(WARNING "No java compiler found. Wont be able to build java viewer")