WIP: insert elements from V2 framework into the trunk (add missing files)

[openjpeg.git] / thirdparty / CMakeLists.txt

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index b129d0e5d3d9c687d6f262bf06d9da978fc3e38b..a3f9509519ccecdd1fa9353f78d3f412c221e938 100644 (file)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -18,7 +18,7 @@ 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("Your system seems to have a Z lib available, we will use it to generate PNG lib")
 
 ELSE (ZLIB_FOUND) # not found
   
@@ -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)")
@@ -42,11 +42,11 @@ IF (ZLIB_FOUND)
 
   IF(PNG_FOUND)
 
-    message("Your system seems to have a PNG lib available, we will used it")
+    message("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
     
@@ -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)
@@ -73,7 +73,7 @@ FIND_PACKAGE(TIFF)
 
 IF(TIFF_FOUND)
 
-  message("Your system seems to have a TIFF lib available, we will used it")
+  message("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)
@@ -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)
@@ -103,7 +103,7 @@ FIND_PACKAGE(LCMS2)
 
 IF(LCMS2_FOUND)
 
-  message("Your system seems to have a LCMS2 lib available, we will used it")
+  message("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)
@@ -115,7 +115,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("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)
@@ -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)
@@ -143,4 +143,21 @@ ELSE (LCMS2_FOUND) # not found lcms2
   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("Your system seems to have a FCGI lib available, we will use it to build JPIP")
+
+ELSE (FCGI_FOUND) # not found
+  
+  message("FCGI lib not found, JPIP will not be built as it requires FCGI")
+    
+ENDIF(FCGI_FOUND)
+
+