X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2FCMakeLists.txt;h=ceb9029faa832b66bb999b6d1fc7a42e49bbde98;hb=dbd132dca8f87a75c5d5addb1e6324da7c089c09;hp=cd7b678678227af0bf7697d8953d73b184a699ff;hpb=c5c3ca370e66809b768ab0dfd93e4472a29b17b7;p=openjpeg.git

diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index cd7b6786..ceb9029f 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -1,13 +1,11 @@
 INCLUDE_REGULAR_EXPRESSION("^.*$")
 # Defines the source code for the library
-SET(OpenJPEG_SRCS
+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,26 +21,20 @@ SET(OpenJPEG_SRCS
   tgt.c
 )
 
-IF(WIN32 AND BUILD_SHARED_LIBS)
-  SET(UNDERSCORE)
-  IF(BORLAND)
-    SET(UNDERSCORE "_")
-  ENDIF(BORLAND)
-  CONFIGURE_FILE(
-    ${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.def.in
-    ${OPENJPEG_BINARY_DIR}/libopenjpeg/openjpeg.def
-    @ONLY IMMEDIATE
-    )
-  IF(NOT BORLAND)
-    SET(OpenJPEG_SRCS ${OpenJPEG_SRCS}
-      ${OPENJPEG_BINARY_DIR}/libopenjpeg/openjpeg.def
-      )
-  ENDIF(NOT BORLAND)
-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)