[2.0] Backport all changes since r2798 (included) from trunk

[openjpeg.git] / src / bin / jp2 / CMakeLists.txt

diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index 62047e42a705d47b5051978f2094d8dedc93fac8..4374631743a69204380add3bbaf8a8eb00bc3b52 100644 (file)
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -10,6 +10,8 @@ set(common_SRCS
 
 # Headers file are located here:
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${LCMS_INCLUDE_DIRNAME}
@@ -35,7 +37,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
   # To support universal exe:
   if(ZLIB_FOUND AND APPLE)
     target_link_libraries(${exe} z)
-  ELSe(ZLIB_FOUND AND APPLE)
+  else(ZLIB_FOUND AND APPLE)
     target_link_libraries(${exe} ${Z_LIBNAME})
   endif()