summaryrefslogtreecommitdiff
path: root/wrapping/java/openjp2/CMakeLists.txt
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-15 09:43:28 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-15 09:43:28 +0000
commitb24cf8d1574c00915c568314d3e0e011ca77ba89 (patch)
tree8b7a38010ecb205749e715a07fbbdf1ea1a29833 /wrapping/java/openjp2/CMakeLists.txt
parent2ad90b7c418544b1605e5b943b3fb2005c3beb65 (diff)
[trunk] Fix Java binding compilation. Need to link against openmj2 for now to resolve all symbols.
Add a local indec.c (pulled from opj 1.5 branch)
Diffstat (limited to 'wrapping/java/openjp2/CMakeLists.txt')
-rw-r--r--wrapping/java/openjp2/CMakeLists.txt14
1 files changed, 13 insertions, 1 deletions
diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
index 8f53cb76..e4d3a407 100644
--- a/wrapping/java/openjp2/CMakeLists.txt
+++ b/wrapping/java/openjp2/CMakeLists.txt
@@ -4,6 +4,9 @@
set(openjpegjni_SRCS
JavaOpenJPEGDecoder.c
JavaOpenJPEG.c
+ ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
+ ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c
+ index.c
)
# JNI binding:
@@ -13,7 +16,6 @@ include_directories(${JNI_INCLUDE_DIRS})
# required header file:
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
- #${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${OPENJPEG_SOURCE_DIR}/src/bin/jp2
@@ -22,6 +24,16 @@ include_directories(
add_library(openjpegjni MODULE
${openjpegjni_SRCS}
)
+# FIXME (need to use old API):
+if(BUILD_MJ2)
+ target_link_libraries(openjpegjni openmj2)
+endif()
+target_link_libraries(openjpegjni
+ ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} ${Z_LIBNAME}
+)
+if(UNIX)
+ target_link_libraries(openjpegjni m)
+endif()
# build jar:
find_package(Java 1.5 REQUIRED) # javac, jar