Fix installation rules in jpwl for CMake

diff --git a/CHANGES b/CHANGES
index 90c75911e848eb8ea40f4aab0d346d1b7a7a56f3..6a744a575383b904a871b4e549764d01b55054a9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 28, 2010
+* [ben.boeckel] Set the soname and soversion on the jpwl library with CMake
++ [ben.boeckel] Install jpwl binaries with CMake
+
 October 26, 2010
 * [ben.boeckel] Install symlinks to versioned directory headers when using CMake
 + [ben.boeckel] Set the library version on jp3d when using CMake

diff --git a/jpwl/CMakeLists.txt b/jpwl/CMakeLists.txt
index 161fbdddba455e2acc21cd131f11e28cfb313231..ee4856d094a2fbdaef12206352d2b9d3d24795b3 100755 (executable)
--- a/jpwl/CMakeLists.txt
+++ b/jpwl/CMakeLists.txt
@@ -33,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
@@ -86,3 +92,6 @@ 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
+)