ENH: This time for real. Install is ok. STYLE: some minor stuff

[gdcm.git] / src / gdcmopenjpeg / libopenjpeg / CMakeLists.txt

diff --git a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
index 6b0baebeb771214a4a085a060c7d5ab882498dd9..965759c2b3cc58566de422b1bb8d6a9739c8f3bd 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
@@ -1,13 +1,11 @@
 INCLUDE_REGULAR_EXPRESSION("^.*$")
-# Create the lib
-SET(openjpeg_SRCS
+# Defines the source code for the library
+SET(OpenJPEG_SRCS
   bio.c
   cio.c
   dwt.c
   event.c
-  fix.c
   image.c
-  int.c
   j2k.c
   j2k_lib.c
   jp2.c
@@ -23,14 +21,23 @@ SET(openjpeg_SRCS
   tgt.c
 )
 
+# Pass proper definition to preprocessor to generate shared lib
 IF (WIN32)
   IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_SHARED)
+    ADD_DEFINITIONS(-DOPJ_EXPORTS)
   ELSE (BUILD_SHARED_LIBS)
     ADD_DEFINITIONS(-DOPJ_STATIC)
   ENDIF (BUILD_SHARED_LIBS)
 ENDIF (WIN32)
 
-ADD_LIBRARY(${PARENT_PREFIX}openjpeg ${openjpeg_SRCS})
+# Create the library
+ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS})
 
+# Install library
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    ${OPJ_PREFIX}openjpeg)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)