[trunk] Continue FolderReorgProposal task. Missing java wrapping

Update issue 177

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)

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()

wrapping/CMakeLists.txt

@@ -0,0 +1,4 @@
+# wrapping
+if(BUILD_JAVA)
+  add_subdirectory(java)
+endif()

wrapping/java/CMakeLists.txt

@@ -0,0 +1,2 @@
+# 
+add_subdirectory(openjp2)

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}/src/lib/openjp2
-  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
-  ${OPENJPEG_SOURCE_DIR}/applications/codec
+  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2
   )
 
 add_library(openjpegjni MODULE