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

correct some troubles about thirdparty when they are used

This commit is contained in:
Mickael Savinaud 2011-07-22 14:26:57 +00:00
parent ec398229b1
commit 06363c01e4
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
July 22, 2011
! [mickael] correct some troubles about thirdparty when they are used
July 21, 2011 July 21, 2011
! [mickael] correct a compil error linked to getopt with win platform ! [mickael] correct a compil error linked to getopt with win platform
!+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. !+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests.

10
tests/CMakeLists.txt
View File

@ -3,6 +3,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg
${OPENJPEG_SOURCE_DIR}/applications/codec ${OPENJPEG_SOURCE_DIR}/applications/codec
${OPENJPEG_SOURCE_DIR}/applications/common ${OPENJPEG_SOURCE_DIR}/applications/common
${Z_INCLUDE_DIRNAME}
${PNG_INCLUDE_DIRNAME}
${TIFF_INCLUDE_DIRNAME}
) )
# First thing define the common source: # First thing define the common source:
@ -19,9 +22,10 @@ ENDIF(DONT_HAVE_GETOPT)
ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS}) ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS})
TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME} TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME}
${PNG_LIBNAME} ${Z_LIBNAME}
${TIFF_LIBNAME} ${PNG_LIBNAME}
) ${TIFF_LIBNAME}
)
# No image send to the dashboard if lib PNG is not available. # No image send to the dashboard if lib PNG is not available.
IF(NOT HAVE_LIBPNG) IF(NOT HAVE_LIBPNG)

14
thirdparty/CMakeLists.txt vendored
View File

@ -26,8 +26,8 @@ ELSE (ZLIB_FOUND) # not found
# Try to build it # Try to build it
message("We will build Z lib from thirdparty") message("We will build Z lib from thirdparty")
ADD_SUBDIRECTORY(libz) ADD_SUBDIRECTORY(libz)
SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE) SET(Z_LIBNAME z PARENT_SCOPE)
SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) SET(Z_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include PARENT_SCOPE)
SET(ZLIB_FOUND 1) SET(ZLIB_FOUND 1)
ELSE (BUILD_THIRDPARTY) ELSE (BUILD_THIRDPARTY)
message("Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)") message("Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)")
@ -56,8 +56,8 @@ IF (ZLIB_FOUND)
ADD_SUBDIRECTORY(libpng) ADD_SUBDIRECTORY(libpng)
SET(HAVE_PNG_H 1 PARENT_SCOPE) SET(HAVE_PNG_H 1 PARENT_SCOPE)
SET(HAVE_LIBPNG 1 PARENT_SCOPE) SET(HAVE_LIBPNG 1 PARENT_SCOPE)
SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE) SET(PNG_LIBNAME png PARENT_SCOPE)
SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR} PARENT_SCOPE) SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE)
ELSE (BUILD_THIRDPARTY) ELSE (BUILD_THIRDPARTY)
SET(HAVE_PNG_H 0 PARENT_SCOPE) SET(HAVE_PNG_H 0 PARENT_SCOPE)
SET(HAVE_LIBPNG 0 PARENT_SCOPE) SET(HAVE_LIBPNG 0 PARENT_SCOPE)
@ -85,8 +85,8 @@ ELSE (TIFF_FOUND) # not found
# Try to build it # Try to build it
message("We will build TIFF lib from thirdparty") message("We will build TIFF lib from thirdparty")
ADD_SUBDIRECTORY(libtiff) ADD_SUBDIRECTORY(libtiff)
SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) SET(TIFF_LIBNAME tiff PARENT_SCOPE)
SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) SET(TIFF_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff PARENT_SCOPE)
SET(HAVE_TIFF_H 1 PARENT_SCOPE) SET(HAVE_TIFF_H 1 PARENT_SCOPE)
SET(HAVE_LIBTIFF 1 PARENT_SCOPE) SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
ELSE (BUILD_THIRDPARTY) ELSE (BUILD_THIRDPARTY)
@ -130,7 +130,7 @@ ELSE (LCMS2_FOUND) # not found lcms2
# Try to build lcms2 # Try to build lcms2
message("We will build LCMS2 lib from thirdparty") message("We will build LCMS2 lib from thirdparty")
ADD_SUBDIRECTORY(liblcms2) ADD_SUBDIRECTORY(liblcms2)
SET(LCMS_LIBNAME "lcms2" PARENT_SCOPE) SET(LCMS_LIBNAME lcms2 PARENT_SCOPE)
SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) # SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) #
SET(HAVE_LCMS2_H 1 PARENT_SCOPE) SET(HAVE_LCMS2_H 1 PARENT_SCOPE)
SET(HAVE_LIBLCMS2 1 PARENT_SCOPE) SET(HAVE_LIBLCMS2 1 PARENT_SCOPE)

1
thirdparty/libtiff/CMakeLists.txt vendored
View File

@ -39,7 +39,6 @@ SET(TARGET_FILES
tif_predict.h tif_predict.h
tif_print.c tif_print.c
tif_read.c tif_read.c
tif_stream.cxx
tif_strip.c tif_strip.c
tif_swab.c tif_swab.c
tif_thunder.c tif_thunder.c