Merge pull request #610 from stweil/master

[openjpeg.git] / src / lib / openjpwl / CMakeLists.txt

diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
index 1cbf901d251c8c2ebeca870de8c74bb1f0465ec7..9e2ace75ae1241df3d5baf5df0dc08bf55ab90b9 100644 (file)
--- a/src/lib/openjpwl/CMakeLists.txt
+++ b/src/lib/openjpwl/CMakeLists.txt
@@ -3,30 +3,24 @@
 add_definitions(-DUSE_JPWL)
 
 set(OPENJPEG_SRCS
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/bio.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cio.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/dwt.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/event.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/image.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k_lib.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jp2.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jpt.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mct.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mqc.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/openjpeg.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/pi.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/raw.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t1.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/bio.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/cio.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/dwt.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/event.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/image.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/j2k.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/jp2.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/jpt.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/mct.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/mqc.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/openjpeg.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/j2k_lib.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/pi.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/raw.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/t1.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/t2.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/tcd.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/tgt.c
 )
 
 set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
@@ -38,8 +32,9 @@ if(APPLE)
 endif()
 
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
-  ${OPENJPEG_SOURCE_DIR}/src/lib
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjpwl
   )
 
 # Build the library
@@ -51,8 +46,14 @@ if(WIN32)
   endif()
 endif()
 add_library(openjpwl ${JPWL_SRCS} ${OPENJPEG_SRCS})
+if(UNIX)
+  target_link_libraries(openjpwl m)
+endif()
 set_target_properties(openjpwl
   PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+if(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
+  target_compile_options(openjpwl PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
+endif()
 
 # Install library
 install(TARGETS openjpwl