[trunk] fix a bug during the creation of the codestream index

[openjpeg.git] / thirdparty / CMakeLists.txt

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index c779ff953167614cf81d836b557bf4cf5439f467..3f378bcbdbdc3701ad15bf786fa37c5b7b25f3f2 100644 (file)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 IF(UNIX OR CYGWIN)
   SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include 
     /opt/local/include /usr/include/libpng /usr/include/libpng14
@@ -18,19 +16,19 @@ IF(ZLIB_FOUND)
 
   SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE)
   SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) 
-  message("Your system seems to have a Z lib available, we will used it to generate PNG lib")
+  message(STATUS "Your system seems to have a Z lib available, we will use it to generate PNG lib")
 
 ELSE (ZLIB_FOUND) # not found
   
   IF(BUILD_THIRDPARTY)
     # Try to build it
-    message("We will build Z lib from thirdparty")
+    message(STATUS "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)")
+    message(WARNING "Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)")
   ENDIF(BUILD_THIRDPARTY) 
     
 ENDIF(ZLIB_FOUND)
@@ -42,32 +40,29 @@ IF (ZLIB_FOUND)
 
   IF(PNG_FOUND)
 
-    message("Your system seems to have a PNG lib available, we will used it")
+    message(STATUS "Your system seems to have a PNG lib available, we will use it")
     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_INCLUDE_DIRNAME ${PNG_PNG_INCLUDE_DIR} PARENT_SCOPE) 
     
   ELSE(PNG_FOUND) # not found
     
     IF(BUILD_THIRDPARTY)
       # Try to build it
-      message("We will build PNG lib from thirdparty")
+      message(STATUS "We will build PNG lib from thirdparty")
       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)
-      message("PNG lib not found, activate BUILD_THIRDPARTY if you want build it")
+      message(WARNING "PNG lib not found, activate BUILD_THIRDPARTY if you want build it")
     ENDIF(BUILD_THIRDPARTY) 
 
   ENDIF(PNG_FOUND)
-  
-ELSE (ZLIB_FOUND)
-  message(WARNING "To add lib PNG we need that ZLIB was previously found")
 ENDIF (ZLIB_FOUND)
 
 #------------
@@ -76,7 +71,7 @@ FIND_PACKAGE(TIFF)
 
 IF(TIFF_FOUND)
 
-  message("Your system seems to have a TIFF lib available, we will used it")
+  message(STATUS "Your system seems to have a TIFF lib available, we will use it")
   SET(HAVE_TIFF_H 1 PARENT_SCOPE)
   SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
   SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
@@ -86,16 +81,16 @@ ELSE (TIFF_FOUND) # not found
   
   IF(BUILD_THIRDPARTY)
     # Try to build it
-    message("We will build TIFF lib from thirdparty")
+    message(STATUS "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)
     SET(HAVE_TIFF_H 0 PARENT_SCOPE)
     SET(HAVE_LIBTIFF 0 PARENT_SCOPE)
-    message("TIFF lib not found, activate BUILD_THIRDPARTY if you want build it")
+    message(WARNING "TIFF lib not found, activate BUILD_THIRDPARTY if you want build it")
   ENDIF(BUILD_THIRDPARTY) 
     
 ENDIF(TIFF_FOUND)
@@ -106,7 +101,7 @@ FIND_PACKAGE(LCMS2)
 
 IF(LCMS2_FOUND)
 
-  message("Your system seems to have a LCMS2 lib available, we will used it")
+  message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
   SET(HAVE_LCMS2_H 1 PARENT_SCOPE)
   SET(HAVE_LIBLCMS2 1 PARENT_SCOPE)
   SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
@@ -118,7 +113,7 @@ ELSE (LCMS2_FOUND) # not found lcms2
   
   IF(LCMS_FOUND)
   
-    message("Your system seems to have a LCMS lib available, we will used it")
+    message(STATUS "Your system seems to have a LCMS lib available, we will use it")
     SET(HAVE_LCMS_H 1 PARENT_SCOPE)
     SET(HAVE_LIBLCMS 1 PARENT_SCOPE)
     SET(LCMS_LIBNAME ${LCMS_LIBRARIES} PARENT_SCOPE)
@@ -131,19 +126,36 @@ ELSE (LCMS2_FOUND) # not found lcms2
     IF( BUILD_THIRDPARTY)
 
       # Try to build lcms2
-      message("We will build LCMS2 lib from thirdparty")
+      message(STATUS "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)
     ELSE (BUILD_THIRDPARTY)
         SET(HAVE_LCMS2_H 0 PARENT_SCOPE)
         SET(HAVE_LIBLCMS2 0 PARENT_SCOPE)
-        message("LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
+        message(WARNING "LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
     ENDIF(BUILD_THIRDPARTY) 
     
   ENDIF (LCMS_FOUND)
 ENDIF(LCMS2_FOUND)
 
+#------------
+# Try to find lib FCGI
+FIND_PACKAGE(FCGI)
+
+IF(FCGI_FOUND)
+
+  SET(FCGI_LIBNAME ${FCGI_LIBRARIES} PARENT_SCOPE)
+  SET(FCGI_INCLUDE_DIRNAME ${FCGI_INCLUDE_DIRS} PARENT_SCOPE) 
+  message(STATUS "Your system seems to have a FCGI lib available, we will use it to build JPIP")
+
+ELSE (FCGI_FOUND) # not found
+  
+  message(WARNING "FCGI lib not found, JPIP will not be built as it requires FCGI")
+    
+ENDIF(FCGI_FOUND)
+
+