Changeset 1776 for code/trunk/cmake/FindZLIB.cmake

Timestamp:

Sep 13, 2008, 9:32:44 PM (16 years ago)

Author:

landauf

Message:

Many changes in almost all FindXYZ.cmake files. They now throw errors if something wasn't found.

File:

• code/trunk/cmake/FindZLIB.cmake (modified) (4 diffs)

code/trunk/cmake/FindZLIB.cmake

@@ -3 +3 @@
 #
 #  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
-#  ZLIB_LIBRARIES   - List of libraries when using zlib.
+#  ZLIB_LIBRARY     - List of libraries when using zlib.
 #  ZLIB_FOUND       - True if zlib found.
 #
@@ -9 +9 @@
 #  to make it work on the Tardis Infrastucture of the ETH Zurich
 #
+# Several changes and additions by Fabian 'x3n' Landau
+#                 > www.orxonox.net <
+
+IF (ZLIB_INCLUDE_DIR)
+  SET(ZLIB_FIND_QUIETLY TRUE)
+ENDIF (ZLIB_INCLUDE_DIR)
 
 IF(UNIX)
-  IF (ZLIB_INCLUDE_DIR)
-  # Already in cache, be silent
-    SET(ZLIB_FIND_QUIETLY TRUE)
-  ENDIF (ZLIB_INCLUDE_DIR)
-
   FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
     /usr/pack/zziplib-0.13.49-sd/include/
@@ -27 +28 @@
     PATHS /usr/pack/zziplib-0.13.49-sd/i686-debian-linux3.1/lib/ /usr/lib /usr/local/lib
   )
-
-  IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-    SET(ZLIB_FOUND TRUE)
-      SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
-  ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-    SET(ZLIB_FOUND FALSE)
-    SET( ZLIB_LIBRARIES )
-  ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-
-  IF (ZLIB_FOUND)
-    IF (NOT ZLIB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}")
-    ENDIF (NOT ZLIB_FIND_QUIETLY)
-  ELSE (ZLIB_FOUND)
-    IF (ZLIB_FIND_REQUIRED)
-        MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.")
-        MESSAGE(FATAL_ERROR "Could NOT find z library")
-    ENDIF (ZLIB_FIND_REQUIRED)
-  ENDIF (ZLIB_FOUND)
-
-  MARK_AS_ADVANCED(
-    ZLIB_LIBRARY
-    ZLIB_INCLUDE_DIR
-  )
 ENDIF(UNIX)
 
 IF(WIN32)
-  IF(EXISTS "../libs/ogre/Dependencies/lib/Release")
-    SET (ZLIB_LIBRARY_DIR "../libs/ogre/Dependencies/lib/Release")
-  ENDIF(EXISTS "../libs/ogre/Dependencies/lib/Release")
+  IF(EXISTS "../libs/zlib")
+    SET (ZLIB_LIBRARY_DIR "../libs/zlib")
+  ENDIF(EXISTS "../libs/zlib")
 
   FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-    ../libs/ogre/Dependencies/include
+    ../libs/zlib/include
   )
 
@@ -66 +43 @@
     PATHS ${ZLIB_LIBRARY_DIR}
   )
+ENDIF(WIN32)
 
-  IF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
-    MESSAGE(STATUS "Zlib was found.")
-  ELSE(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
-    MESSAGE(FATAL_ERROR "Zlib was NOT found.")
-  ENDIF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
-ENDIF(WIN32)
+SET(ZLIB_FOUND FALSE)
+IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+  SET(ZLIB_FOUND TRUE)
+ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+
+IF (ZLIB_FOUND)
+  IF (NOT ZLIB_FIND_QUIETLY)
+    MESSAGE(STATUS "ZLIB was found.")
+    IF (VERBOSE_FIND)
+      MESSAGE (STATUS "  include path: ${ZLIB_INCLUDE_DIR}")
+      MESSAGE (STATUS "  library path: ${ZLIB_LIBRARY}")
+      MESSAGE (STATUS "  libraries:    zlib")
+    ENDIF (VERBOSE_FIND)
+  ENDIF (NOT ZLIB_FIND_QUIETLY)
+ELSE (ZLIB_FOUND)
+  IF (NOT ZLIB_INCLUDE_DIR)
+    MESSAGE(SEND_ERROR "ZLIB include path was not found.")
+  ENDIF (NOT ZLIB_INCLUDE_DIR)
+  IF (NOT ZLIB_LIBRARY)
+    MESSAGE(SEND_ERROR "ZLIB was not found.")
+    MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.")
+  ENDIF (NOT ZLIB_LIBRARY)
+ENDIF (ZLIB_FOUND)
+
+MARK_AS_ADVANCED(
+  ZLIB_LIBRARY
+  ZLIB_INCLUDE_DIR
+)