[trunk] Set of warnings fix for gcc -pedantic

[openjpeg.git] / thirdparty / CMakeLists.txt

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 7bbdfc16103209e1ded7c3c6892aa16e6393fabe..844d1831d821769319bfe7e37796ae460420f92a 100644 (file)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -1,4 +1,4 @@
-# 3rd party libs  
+# 3rd party libs
 
 #------------
 # Try to find lib Z
@@ -14,14 +14,14 @@ ELSE (BUILD_THIRDPARTY)
   FIND_PACKAGE(ZLIB)
   IF(ZLIB_FOUND)
     SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE)
-    SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) 
+    SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE)
     message(STATUS "Your system seems to have a Z lib available, we will use it to generate PNG lib")
     message(STATUS "DEBUG: ${ZLIB_INCLUDE_DIRS} vs ${ZLIB_INCLUDE_DIR}")
   ELSE (ZLIB_FOUND) # not found
     message(STATUS "Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)")
   ENDIF(ZLIB_FOUND)
-ENDIF(BUILD_THIRDPARTY) 
-    
+ENDIF(BUILD_THIRDPARTY)
+
 
 #------------
 # Try to find lib PNG (which depends on zlib)
@@ -41,26 +41,26 @@ ELSE (BUILD_THIRDPARTY)
       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_PNG_INCLUDE_DIR} PARENT_SCOPE) 
+      SET(PNG_INCLUDE_DIRNAME ${PNG_PNG_INCLUDE_DIR} PARENT_SCOPE)
     ELSE(PNG_FOUND) # not found
       SET(HAVE_PNG_H 0 PARENT_SCOPE)
       SET(HAVE_LIBPNG 0 PARENT_SCOPE)
       message(STATUS "PNG lib not found, activate BUILD_THIRDPARTY if you want build it")
     ENDIF(PNG_FOUND)
   ENDIF (ZLIB_FOUND)
-ENDIF(BUILD_THIRDPARTY) 
+ENDIF(BUILD_THIRDPARTY)
 
 #------------
 # Try to find lib TIFF
-  
+
 IF(BUILD_THIRDPARTY)
   # Try to build it
   message(STATUS "We will build TIFF lib from thirdparty")
   ADD_SUBDIRECTORY(libtiff)
   SET(TIFF_LIBNAME tiff PARENT_SCOPE)
-  SET(TIFF_INCLUDE_DIRNAME 
-    ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff 
-    ${OPENJPEG_BINARY_DIR}/thirdparty/libtiff 
+  SET(TIFF_INCLUDE_DIRNAME
+    ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff
+    ${OPENJPEG_BINARY_DIR}/thirdparty/libtiff
     PARENT_SCOPE)
   SET(HAVE_TIFF_H 1 PARENT_SCOPE)
   SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
@@ -71,13 +71,13 @@ ELSE (BUILD_THIRDPARTY)
     SET(HAVE_TIFF_H 1 PARENT_SCOPE)
     SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
     SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
-    SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) 
+    SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
   ELSE (TIFF_FOUND) # not found
     SET(HAVE_TIFF_H 0 PARENT_SCOPE)
     SET(HAVE_LIBTIFF 0 PARENT_SCOPE)
     message(STATUS "TIFF lib not found, activate BUILD_THIRDPARTY if you want build it")
   ENDIF(TIFF_FOUND)
-ENDIF(BUILD_THIRDPARTY) 
+ENDIF(BUILD_THIRDPARTY)
 
 #------------
 # Try to find lib LCMS2 (or by default LCMS)
@@ -99,20 +99,20 @@ ELSE (BUILD_THIRDPARTY)
     SET(HAVE_LCMS2_H 1 PARENT_SCOPE)
     SET(HAVE_LIBLCMS2 1 PARENT_SCOPE)
     SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
-    SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) 
+    SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
   ELSE (LCMS2_FOUND) # not found lcms2
     # try to find LCMS
-    FIND_PACKAGE(LCMS)  
+    FIND_PACKAGE(LCMS)
     IF(LCMS_FOUND)
       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)
-      SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIRS} PARENT_SCOPE) 
+      SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIRS} PARENT_SCOPE)
     ELSE (LCMS_FOUND) # not found lcms
       SET(HAVE_LCMS2_H 0 PARENT_SCOPE)
       SET(HAVE_LIBLCMS2 0 PARENT_SCOPE)
       message(STATUS "LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
     ENDIF (LCMS_FOUND)
   ENDIF(LCMS2_FOUND)
-ENDIF(BUILD_THIRDPARTY) 
+ENDIF(BUILD_THIRDPARTY)