From 028720c9ec1a330728a2eb6fcd5faadef99cdeb9 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 28 Sep 2012 08:17:02 +0000 Subject: [PATCH] [trunk] Continue FolderReorgProposal task. Missing java wrapping Update issue 177 --- CMakeLists.txt | 1 + src/lib/CMakeLists.txt | 14 ++++++++++++++ wrapping/CMakeLists.txt | 4 ++++ wrapping/java/CMakeLists.txt | 2 ++ wrapping/java/openjp2/CMakeLists.txt | 6 +++--- 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/lib/CMakeLists.txt create mode 100644 wrapping/CMakeLists.txt create mode 100644 wrapping/java/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index ecf67098..7c7267bb 100644 --- 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 index 00000000..b69399a5 --- /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 index 00000000..c697d68e --- /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 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