From 02012d50cfe73fbf49972dcc9d928fba899ebae3 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Tue, 14 Apr 2009 21:18:52 +0200
Subject: Update some cmake macros

---
 cmake/FindFontconfig.cmake |  6 ++++++
 cmake/FindOpenGL.cmake     |  9 +++++++++
 cmake/FindZIP.cmake        | 39 ++++++++++++++++++---------------------
 3 files changed, 33 insertions(+), 21 deletions(-)

(limited to 'cmake')

diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
index 268a61a..3125c73 100644
--- a/cmake/FindFontconfig.cmake
+++ b/cmake/FindFontconfig.cmake
@@ -43,6 +43,12 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
 
   include(FindPackageHandleStandardArgs)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
+
+  IF(NOT FONTCONFIG_FOUND)
+    IF(FONTCONFIG_REQUIRED)
+      MESSAGE(FATAL_ERROR "fontconfig not found")
+    ENDIF(FONTCONFIG_REQUIRED)
+  ENDIF(NOT FONTCONFIG_FOUND)
   
   mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
 
diff --git a/cmake/FindOpenGL.cmake b/cmake/FindOpenGL.cmake
index 1c2648a..4e6191e 100644
--- a/cmake/FindOpenGL.cmake
+++ b/cmake/FindOpenGL.cmake
@@ -125,6 +125,15 @@ IF(OPENGL_gl_LIBRARY)
 
 ENDIF(OPENGL_gl_LIBRARY)
 
+IF (OPENGL_LIBRARIES AND OPENGL_INCLUDE_DIR)
+	SET(OPENGL_FOUND TRUE)
+ELSE (OPENGL_LIBRARIES AND OPENGL_INCLUDE_DIR)
+	SET(OPENGL_FOUND FALSE)
+	IF(OPENGL_REQUIRED)
+		MESSAGE(FATAL_ERROR "OPENGL not found")
+	ENDIF(OPENGL_REQUIRED)
+ENDIF (OPENGL_LIBRARIES AND OPENGL_INCLUDE_DIR)
+
 # This deprecated setting is for backward compatibility with CMake1.4
 SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
 
diff --git a/cmake/FindZIP.cmake b/cmake/FindZIP.cmake
index 4a40e5c..423c07a 100644
--- a/cmake/FindZIP.cmake
+++ b/cmake/FindZIP.cmake
@@ -6,29 +6,26 @@
 #  ZIP_FOUND       - True if zip found.
 
 
-IF (ZIP_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(ZIP_FIND_QUIETLY TRUE)
-ENDIF (ZIP_INCLUDE_DIR)
+IF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR)
+	# Already in cache, be silent
+	SET(ZIP_FIND_QUIETLY TRUE)
+ELSE(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR)
+	FIND_PATH(ZIP_INCLUDE_DIR zip.h)
 
-FIND_PATH(ZIP_INCLUDE_DIR zip.h)
+	SET(ZIP_NAMES zip)
+	FIND_LIBRARY(ZIP_LIBRARY NAMES ${ZIP_NAMES})
 
-SET(ZIP_NAMES zip)
-FIND_LIBRARY(ZIP_LIBRARY NAMES ${ZIP_NAMES} )
+	# handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if 
+	# all listed variables are TRUE
+	INCLUDE(FindPackageHandleStandardArgs)
+	FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP DEFAULT_MSG ZIP_LIBRARIES ZIP_INCLUDE_DIR)
 
-# handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP DEFAULT_MSG ZIP_LIBRARY ZIP_INCLUDE_DIR)
-
-IF(ZIP_FOUND)
-  SET( ZIP_LIBRARIES ${ZIP_LIBRARY} )
-ELSE(ZIP_FOUND)
-   SET(ZIP_FOUND FALSE)
-      IF (ZIP_REQUIRED)
-			        MESSAGE(FATAL_ERROR "libzip not found")
-	  ENDIF (ZIP_REQUIRED)
-  SET( ZIP_LIBRARIES )
-ENDIF(ZIP_FOUND)
+	IF(NOT ZIP_FOUND)
+		IF(ZIP_REQUIRED)
+			MESSAGE(FATAL_ERROR "libzip not found")
+		ENDIF(ZIP_REQUIRED)
+		SET(ZIP_LIBRARIES)
+	ENDIF(NOT ZIP_FOUND)
+ENDIF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR)
 
 MARK_AS_ADVANCED( ZIP_LIBRARY ZIP_INCLUDE_DIR )
-- 
cgit v1.2.3