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

fix compilation with freeimage

This commit is contained in:
Mathieu Malaterre 2010-07-01 17:41:44 +00:00
parent cab60a170d
commit 315179c719
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -7,7 +7,11 @@
# For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
# e.g.: # e.g.:
# SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG") # SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
CMAKE_MINIMUM_REQUIRED(VERSION 2.4) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
IF(NOT OPENJPEG_NAMESPACE) IF(NOT OPENJPEG_NAMESPACE)
SET(OPENJPEG_NAMESPACE "OPENJPEG") SET(OPENJPEG_NAMESPACE "OPENJPEG")
@ -16,10 +20,6 @@ ENDIF(NOT OPENJPEG_NAMESPACE)
# In all cases: # In all cases:
STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME) STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
PROJECT(${OPENJPEG_NAMESPACE} C) PROJECT(${OPENJPEG_NAMESPACE} C)
# Do full dependency headers. # Do full dependency headers.
@ -127,9 +127,6 @@ SUBDIRS(
# mj2 # mj2
#j2kviewer/src #j2kviewer/src
) )
IF(BUILD_EXAMPLES)
SUBDIRS(codec)
ENDIF(BUILD_EXAMPLES)
#IF(NOT UNIX) #IF(NOT UNIX)
#SUBDIRS( #SUBDIRS(
@ -139,6 +136,12 @@ ENDIF(BUILD_EXAMPLES)
# ) # )
#ENDIF(NOT UNIX) #ENDIF(NOT UNIX)
#-----------------------------------------------------------------------------
# Build example only if requested
IF(BUILD_EXAMPLES)
SUBDIRS(codec)
ENDIF(BUILD_EXAMPLES)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# For the documentation # For the documentation
OPTION(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF) OPTION(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF)
@ -157,6 +160,7 @@ ENDIF(BUILD_TESTING)
IF(BUILD_TESTING) IF(BUILD_TESTING)
SET(CMAKE_MODULE_PATH "${OPENJPEG_SOURCE_DIR}/CMake") SET(CMAKE_MODULE_PATH "${OPENJPEG_SOURCE_DIR}/CMake")
FIND_PACKAGE(FreeImage REQUIRED) FIND_PACKAGE(FreeImage REQUIRED)
INCLUDE_DIRECTORIES( ${FREEIMAGE_INCLUDE_PATH} )
SUBDIRS( SUBDIRS(
test_V2_tile_handling test_V2_tile_handling
@ -166,8 +170,8 @@ ENDIF(BUILD_TESTING)
# Adding test with dataset from: # Adding test with dataset from:
# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/ # http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
# -> wget http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip
# http://www.jpeg.org/jpeg2000guide/testimages/testimages.html # http://www.jpeg.org/jpeg2000guide/testimages/testimages.html
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Adding JPEG2000_CONFORMANCE_DATA_ROOT # Adding JPEG2000_CONFORMANCE_DATA_ROOT
FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html