minor changes in cmake flags

[openjpeg.git] / jpwl / CMakeLists.txt

diff --git a/jpwl/CMakeLists.txt b/jpwl/CMakeLists.txt
index d4552adfd05aad6a85f3022bfc1f69f1c81baed3..ee4856d094a2fbdaef12206352d2b9d3d24795b3 100755 (executable)
--- a/jpwl/CMakeLists.txt
+++ b/jpwl/CMakeLists.txt
@@ -21,6 +21,7 @@ SET(OPJ_SRCS
 ../libopenjpeg/t2.c
 ../libopenjpeg/tcd.c
 ../libopenjpeg/tgt.c
+../libopenjpeg/opj_convert.c
 )
 SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
 
@@ -32,7 +33,13 @@ IF(DONT_HAVE_GETOPT)
   )
 ENDIF(DONT_HAVE_GETOPT)
 
-ADD_LIBRARY(openjpeg_JPWL STATIC ${JPWL_SRCS} ${OPJ_SRCS})
+ADD_LIBRARY(openjpeg_JPWL ${JPWL_SRCS} ${OPJ_SRCS})
+SET_TARGET_PROPERTIES(openjpeg_JPWL PROPERTIES
+  ${OPENJPEG_LIBRARY_PROPERTIES})
+
+INSTALL(TARGETS openjpeg_JPWL
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+)
 
 # Do the proper thing when building static...if only there was configured
 # headers or def files instead
@@ -42,30 +49,49 @@ ENDIF(NOT BUILD_SHARED_LIBS)
 
 INCLUDE_DIRECTORIES(
   ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${LCMS_INCLUDE_DIR}
   )
+IF(PNG_FOUND)
+  INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+ENDIF(PNG_FOUND)
+IF(TIFF_FOUND)
+  INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+ENDIF(TIFF_FOUND)
 
-FIND_PACKAGE(TIFF REQUIRED)
-FIND_PACKAGE(PNG REQUIRED)
-INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )
-INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )
 
 ADD_EXECUTABLE(JPWL_j2k_to_image
 ../codec/convert.c
 ../codec/index.c
 ../codec/j2k_to_image.c
 )
-TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPJ_PREFIX}openjpeg_JPWL ${TIFF_LIBRARIES} ${PNG_LIBRARIES})
+TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPJ_PREFIX}openjpeg_JPWL ${LCMS_LIB})
+IF(PNG_FOUND)
+  TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${PNG_LIBRARIES})
+ENDIF(PNG_FOUND)
+IF(TIFF_FOUND)
+  TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${TIFF_LIBRARIES})
+ENDIF(TIFF_FOUND)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
 ENDIF(UNIX)
 
+
 ADD_EXECUTABLE(JPWL_image_to_j2k
 ../codec/convert.c
 ../codec/index.c
 ../codec/image_to_j2k.c
 )
-TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPJ_PREFIX}openjpeg_JPWL ${TIFF_LIBRARIES} ${PNG_LIBRARIES})
+TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPJ_PREFIX}openjpeg_JPWL ${LCMS_LIB})
+IF(PNG_FOUND)
+  TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${PNG_LIBRARIES})
+ENDIF(PNG_FOUND)
+IF(TIFF_FOUND)
+  TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${TIFF_LIBRARIES})
+ENDIF(TIFF_FOUND)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
 ENDIF(UNIX)
 
+INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
+  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Binaries
+)