walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] Import changes from 1.5 branch

This commit is contained in:
Mathieu Malaterre 2012-07-25 13:10:21 +00:00
parent f28fc6f2e1
commit e38680a4df
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
applications/jpip/util/CMakeLists.txt
View File

@ -1,10 +1,18 @@
# Headers file are located here: # Headers file are located here:
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/libopenjpeg # opj_stdint.h
${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip
${FCGI_INCLUDE_DIRS} ${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) IF(BUILD_JPIP_SERVER)
SET(OPJ_SERVER_SRCS SET(OPJ_SERVER_SRCS
@ -78,6 +86,10 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
COMMENT "building opj_viewer.jar" COMMENT "building opj_viewer.jar"
) )
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
)
# 2. opj_viewer_xerces # 2. opj_viewer_xerces
# search for package org.apache.xerces.parsers # search for package org.apache.xerces.parsers
find_file(APACHE_XERCES_JAR 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 DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
COMMENT "building 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() endif()
else(Java_Development_FOUND) else(Java_Development_FOUND)
message(WARNING "No java compiler found. Wont be able to build java viewer") message(WARNING "No java compiler found. Wont be able to build java viewer")