summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2011-08-27 15:54:52 +0000
committerAntonin Descampe <antonin@gmail.com>2011-08-27 15:54:52 +0000
commite89eb575ac3f6d5076aff5e7d1bf1a442386ebce (patch)
treebb853a9597b6334cd2a36137804bd2d835202e57
parentd15f01b6e3434b0da35d4563edf5a05ac8fae752 (diff)
backport r895 to openjpeg-1.5 branch
-rw-r--r--applications/jpip/CHANGES3
-rw-r--r--applications/jpip/opj_client/opj_dec_server/CMakeLists.txt3
2 files changed, 5 insertions, 1 deletions
diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 8b84700f..4ed52aa5 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPIP
! : changed
+ : added
+August 27, 2011
+* [antonin] fixed missing include directory in opj_client/opj_dec_server/CMakeLists.txt
+
August 26, 2011
* [antonin] fixed cmake and autotools files to reflect recent indexer changes in JPIP
! [kaori] indexer using the latest openjpeg library
diff --git a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
index 437d706f..56c4c7af 100644
--- a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
+++ b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
@@ -8,7 +8,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c
)
INCLUDE_DIRECTORIES(
- ../../libopenjpip
+ ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+ ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip
)
# Build executable