summaryrefslogtreecommitdiff
path: root/wrapping/java
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-09-28 08:17:02 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-09-28 08:17:02 +0000
commit028720c9ec1a330728a2eb6fcd5faadef99cdeb9 (patch)
treeb6aab12bbfceaddb1cf511c7a64d580692286909 /wrapping/java
parentd518970039a19a2a9b6d2bdd592cc88a43897bbb (diff)
[trunk] Continue FolderReorgProposal task. Missing java wrapping
Update issue 177
Diffstat (limited to 'wrapping/java')
-rw-r--r--wrapping/java/CMakeLists.txt2
-rw-r--r--wrapping/java/openjp2/CMakeLists.txt6
2 files changed, 5 insertions, 3 deletions
diff --git a/wrapping/java/CMakeLists.txt b/wrapping/java/CMakeLists.txt
new file mode 100644
index 00000000..dd7b66c2
--- /dev/null
+++ b/wrapping/java/CMakeLists.txt
@@ -0,0 +1,2 @@
+#
+add_subdirectory(openjp2)
diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
index 1b1c9ba1..3641f6ac 100644
--- a/wrapping/java/openjp2/CMakeLists.txt
+++ b/wrapping/java/openjp2/CMakeLists.txt
@@ -12,9 +12,9 @@ include_directories(${JNI_INCLUDE_DIRS})
# required header file:
include_directories(
- ${OPENJPEG_SOURCE_DIR}/libopenjpeg
- ${OPENJPEG_SOURCE_DIR}/applications/common
- ${OPENJPEG_SOURCE_DIR}/applications/codec
+ ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+ ${OPENJPEG_SOURCE_DIR}/src/bin/common
+ ${OPENJPEG_SOURCE_DIR}/src/bin/jp2
)
add_library(openjpegjni MODULE