correct some troubles about thirdparty when they are used

diff --git a/CHANGES b/CHANGES
index 0566072c42e172a7d8a3ef7169eb6a11c1a71d8f..8b8b45243541469233456ea910160d53c9542c7a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+July 22, 2011
+! [mickael] correct some troubles about thirdparty when they are used
+
 July 21, 2011
 ! [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.

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

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index b8c6b3874a5f7c1895b63a6d4e3bb8924f1bf65b..5bcd6113141e0f1b17ad7b2d2f09cc82d9fa792b 100644 (file)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -26,8 +26,8 @@ ELSE (ZLIB_FOUND) # not found
     # Try to build it
     message("We will build Z lib from thirdparty")
     ADD_SUBDIRECTORY(libz)
-    SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE)
-    SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE)
+    SET(Z_LIBNAME z PARENT_SCOPE)
+    SET(Z_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include PARENT_SCOPE)
     SET(ZLIB_FOUND 1)
   ELSE (BUILD_THIRDPARTY)
     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)
       SET(HAVE_PNG_H 1 PARENT_SCOPE)
       SET(HAVE_LIBPNG 1 PARENT_SCOPE)
-      SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE)
-      SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR} PARENT_SCOPE)
+      SET(PNG_LIBNAME png PARENT_SCOPE)
+      SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE)
     ELSE (BUILD_THIRDPARTY)
       SET(HAVE_PNG_H 0 PARENT_SCOPE)
       SET(HAVE_LIBPNG 0 PARENT_SCOPE)
@@ -85,8 +85,8 @@ ELSE (TIFF_FOUND) # not found
     # Try to build it
     message("We will build TIFF lib from thirdparty")
     ADD_SUBDIRECTORY(libtiff)
-    SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
-    SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
+    SET(TIFF_LIBNAME tiff PARENT_SCOPE)
+    SET(TIFF_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff PARENT_SCOPE)
     SET(HAVE_TIFF_H 1 PARENT_SCOPE)
     SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
   ELSE (BUILD_THIRDPARTY)
@@ -130,7 +130,7 @@ ELSE (LCMS2_FOUND) # not found lcms2
       # Try to build lcms2
       message("We will build LCMS2 lib from thirdparty")
       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(HAVE_LCMS2_H 1 PARENT_SCOPE)
       SET(HAVE_LIBLCMS2 1 PARENT_SCOPE)

diff --git a/thirdparty/libtiff/CMakeLists.txt b/thirdparty/libtiff/CMakeLists.txt
index 851c95730f5f54880ef31f7172dfc9e0752121a8..14601f0b7e258980ae1bc0dcc51bdc8ab248717d 100644 (file)
--- a/thirdparty/libtiff/CMakeLists.txt
+++ b/thirdparty/libtiff/CMakeLists.txt
@@ -39,7 +39,6 @@ SET(TARGET_FILES
     tif_predict.h
     tif_print.c
     tif_read.c
-    tif_stream.cxx
     tif_strip.c
     tif_swab.c
     tif_thunder.c