[trunk] Continue FolderReorgProposal task. Missing java wrapping

Update issue 177

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecf6709842acaa35f0328ac0b7ea32d472e8a0d2..7c7267bbba0e31571b83138a2c9d126a1db45213 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,6 +208,7 @@ if(BUILD_CODEC OR BUILD_MJ2)
   add_subdirectory(thirdparty)
   add_subdirectory(src/bin)
 endif ()
+add_subdirectory(wrapping)
 
 include(CheckTypeSize)
 CHECK_TYPE_SIZE(ssize_t     SSIZE_T)

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b69399a
--- /dev/null
+++ b/src/lib/CMakeLists.txt
@@ -0,0 +1,14 @@
+# source code for openjpeg project:
+# Part 1 & 2:
+add_subdirectory(openjp2)
+
+# optionals components:
+if(BUILD_JPIP)
+  add_subdirectory(openjpip)
+endif()
+if(BUILD_JPWL)
+  add_subdirectory(openjpwl)
+endif()
+if(BUILD_JP3D)
+  add_subdirectory(openjp3d)
+endif()

diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c697d68
--- /dev/null
+++ b/wrapping/CMakeLists.txt
@@ -0,0 +1,4 @@
+# wrapping
+if(BUILD_JAVA)
+  add_subdirectory(java)
+endif()

diff --git a/wrapping/java/CMakeLists.txt b/wrapping/java/CMakeLists.txt
new file mode 100644 (file)
index 0000000..dd7b66c
--- /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 1b1c9ba16435f64d6b90b401df587cd4bcff4d2b..3641f6acab45484c35dc42bc474de7a7aeeb5b6f 100644 (file)
--- 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