diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-07-25 13:10:21 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-07-25 13:10:21 +0000 |
| commit | e38680a4dfd751e5321a2714b5665e86bffc72c0 (patch) | |
| tree | 442815be0b5765eaeb9fdbdf5f799eddc4bd48c1 | |
| parent | f28fc6f2e10fa10e17ccaac745d0adf5ebdd8732 (diff) | |
[trunk] Import changes from 1.5 branch
| -rw-r--r-- | applications/jpip/util/CMakeLists.txt | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt index 4f449758..2f2410dc 100644 --- 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") |