Changed cmake version test to allow for cmake 2.8.11.x

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

diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
index 6ae7358306ea9e582eba7093585e6b30f888191b..25294b20ec77bd51f2d47aa176729c9d3a97fd78 100644 (file)
--- a/src/lib/openmj2/CMakeLists.txt
+++ b/src/lib/openmj2/CMakeLists.txt
@@ -1,40 +1,64 @@
+# openmj2:
 set(OPENMJ2_LIBRARY_NAME openmj2)
+
+include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  )
+
 set(OPENMJ2_SRCS
   mj2.c
   mj2_convert.c
+# FIXME: legacy
+  j2k_lib.c
+  cio.c
+  jp2.c
+  j2k.c
+  tcd.c
+  mct.c
+  t1.c
+  t2.c
+  pi.c
+  bio.c
+  mqc.c
+  tgt.c
+  dwt.c
+  event.c
+  image.c
+  jpt.c
+  raw.c
+  openjpeg.c
 )
 
 # Build the library
 if(WIN32)
   if(BUILD_SHARED_LIBS)
     add_definitions(-DOPJ_EXPORTS)
-  else(BUILD_SHARED_LIBS)
+  else()
     add_definitions(-DOPJ_STATIC)
-  endif(BUILD_SHARED_LIBS)
-endif(WIN32)
-
-include_directories(
-  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
-  )
+  endif()
+endif()
 
 # build mj2 lib:
 add_library(${OPENMJ2_LIBRARY_NAME} ${OPENMJ2_SRCS})
-target_link_libraries(${OPENMJ2_LIBRARY_NAME} openjpeg)
+# FIXME: We are using an openjpeg 1.5 copy:
+#target_link_libraries(${OPENMJ2_LIBRARY_NAME} openjp2)
 if(UNIX)
   target_link_libraries(${OPENMJ2_LIBRARY_NAME} m)
 endif()
 set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
+  target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
+endif()
 
 # Install library
 install(TARGETS ${OPENMJ2_LIBRARY_NAME}
   EXPORT OpenMJ2Targets
-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} 
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
   COMPONENT Libraries
 )
 
 # Install includes files
-#INSTALL(FILES mj2.h
-#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} 
+#install(FILES mj2.h
+#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
 #  COMPONENT Headers
 #)