ENH: The logic for defining OPJ_STATIC has now been moved to the

     openjpegConfigure.h file.

diff --git a/JavaOpenJPEG/CMakeLists.txt b/JavaOpenJPEG/CMakeLists.txt
index c115e4aa5ce9a5af7cca64ce9074f7c3458b8d92..66509cafd79b13dcee5dfa968b2c8204dd443512 100644 (file)
--- a/JavaOpenJPEG/CMakeLists.txt
+++ b/JavaOpenJPEG/CMakeLists.txt
@@ -19,12 +19,6 @@ INCLUDE_DIRECTORIES(
   ${OPENJPEG_SOURCE_DIR}/libopenjpeg
   )
 
-# Do the proper thing when building static...if only there was configured
-# headers or def files instead
-IF(NOT BUILD_SHARED_LIBS)
-  ADD_DEFINITIONS(-DOPJ_STATIC)
-ENDIF(NOT BUILD_SHARED_LIBS)
-
 FIND_PACKAGE(TIFF REQUIRED)
 
 # Loop over all executables:

diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index da2cb630cf52cb44d53a33d2b3c626bf80bb96f4..fdefce6c42d636f248491c21d825c3e551b7fca4 100644 (file)
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -19,12 +19,6 @@ INCLUDE_DIRECTORIES(
   ${OPENJPEG_SOURCE_DIR}/libopenjpeg
   )
 
-# Do the proper thing when building static...if only there was configured
-# headers or def files instead
-IF(NOT BUILD_SHARED_LIBS)
-  ADD_DEFINITIONS(-DOPJ_STATIC)
-ENDIF(NOT BUILD_SHARED_LIBS)
-
 FIND_PACKAGE(TIFF REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )