[trunk] Continue FolderReorgProposal task. Missing java wrapping

Update issue 177
This commit is contained in:
Mathieu Malaterre 2012-09-28 08:17:02 +00:00
parent d518970039
commit 028720c9ec
5 changed files with 24 additions and 3 deletions

View File

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

14
src/lib/CMakeLists.txt Normal file
View File

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

4
wrapping/CMakeLists.txt Normal file
View File

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

View File

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

View File

@ -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