walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

openjpegConfigure.h file.
This commit is contained in:
Luis Ibanez 2010-09-05 21:37:14 +00:00
parent e80d147957
commit 509f7a64ea
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
JavaOpenJPEG/CMakeLists.txt
View File

@ -19,12 +19,6 @@ INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${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(TIFF REQUIRED)
# Loop over all executables: # Loop over all executables:

6
codec/CMakeLists.txt
View File

@ -19,12 +19,6 @@ INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${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(TIFF REQUIRED)
FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(PNG REQUIRED)
INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )