backport r895 to openjpeg-1.5 branch

2011-08-27 15:54:52 +00:00 · 2011-08-27 15:54:52 +00:00 · e89eb575ac
parent d15f01b6e3
commit e89eb575ac
2 changed files with 5 additions and 1 deletions
--- 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
--- 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