backport r895 to openjpeg-1.5 branch

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 8b84700f2e2493bb69dae36a5992bb37dc57a8a8..4ed52aa5d57c704919513d03d3a8f330b661f1db 100644 (file)
--- 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 437d706f0e5aa45a166b01e03c7fc51d866361fb..56c4c7af031dcd25d548420a4a3fdc5775298515 100644 (file)
--- 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