From 509f7a64eabef4e5ce4927a2ef9f7316aa2b5c23 Mon Sep 17 00:00:00 2001 From: Luis Ibanez Date: Sun, 5 Sep 2010 21:37:14 +0000 Subject: [PATCH] ENH: The logic for defining OPJ_STATIC has now been moved to the openjpegConfigure.h file. --- JavaOpenJPEG/CMakeLists.txt | 6 ------ codec/CMakeLists.txt | 6 ------ 2 files changed, 12 deletions(-) diff --git a/JavaOpenJPEG/CMakeLists.txt b/JavaOpenJPEG/CMakeLists.txt index c115e4aa..66509caf 100644 --- 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 da2cb630..fdefce6c 100644 --- 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} )