X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2FCMakeLists.txt;h=ceb9029faa832b66bb999b6d1fc7a42e49bbde98;hb=4b75a2784c793ded4a4bc78aa0ecb30b7b56cb02;hp=1355b4ae95abcaeaf6fa8e3e6a4740cb693f55b8;hpb=8d7b0c9c0564514d7edd36e8cc260a267c7d4213;p=openjpeg.git

diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index 1355b4ae..ceb9029f 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_REGULAR_EXPRESSION("^.*$")
 # Defines the source code for the library
-SET(OpenJPEG_SRCS
+SET(OPENJPEG_SRCS
   bio.c
   cio.c
   dwt.c
@@ -21,15 +21,20 @@ SET(OpenJPEG_SRCS
   tgt.c
 )
 
-# Pass proper definition to preprocessor to generate
-# shared lib
-IF(WIN32 AND BUILD_SHARED_LIBS)
-  ADD_DEFINITIONS(-DOPJ_EXPORTS)
-ENDIF(WIN32 AND BUILD_SHARED_LIBS)
+# Pass proper definition to preprocessor to generate shared lib
+IF(WIN32)
+  IF(BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPJ_EXPORTS)
+  ELSE(BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPJ_STATIC)
+  ENDIF(BUILD_SHARED_LIBS)
+ENDIF(WIN32)
 
 # Create the library
-ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS})
+ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
 
 # Install library
-INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjpeg)
+INSTALL_TARGETS(/lib/ ${OPENJPEG_LIBRARY_NAME})
 
+# Install includes files
+INSTALL_FILES(/include .h)