diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-25 07:39:59 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-25 07:39:59 +0000 |
| commit | f3d7d2f7b1b0cf41c10c48eaecdab6707780e7f1 (patch) | |
| tree | 8549b6bde309d055f69ae05f79903159d8196a96 /src/lib/openjp2/CMakeLists.txt | |
| parent | 0358983ee649c8ff8cdf690ec6724559bb8f2b00 (diff) | |
[trunk] Rework r2077
r2077 did expose too much of the detail implementation of OpenJPEG. Rework dependencies in between JPIP file level details and JPIP client/server arch.
Move JPIP file level functionalities back into OpenJP2 as was the case in openjpeg 1.5.x. Use new cio func.
Diffstat (limited to 'src/lib/openjp2/CMakeLists.txt')
| -rw-r--r-- | src/lib/openjp2/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index ed8f681c..d1e08cf6 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -7,7 +7,6 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h include_directories( ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h ) - # Defines the source code for the library set(OPENJPEG_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bio.c @@ -31,6 +30,17 @@ set(OPENJPEG_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c ) +if(BUILD_JPIP) + add_definitions(-DUSE_JPIP) + set(OPENJPEG_SRCS + ${OPENJPEG_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c + ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c + ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c + ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c + ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c + ) +endif() # Build the library if(WIN32) |