Changeset 1776 for code/trunk/cmake/FindCEGUI_OGRE.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/FindCEGUI_OGRE.cmake (modified) (2 diffs)

code/trunk/cmake/FindCEGUI_OGRE.cmake

@@ -15 +15 @@
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
+#
+# Several changes and additions by Fabian 'x3n' Landau
+#                 > www.orxonox.net <
 
-IF (CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_INCLUDE_DIR)
+IF (CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_INCLUDE_DIR AND CEGUI_OGRE_LIB_DIR)
     SET(CEGUI_OGRE_FIND_QUIETLY TRUE) # Already in cache, be silent
-ENDIF (CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_INCLUDE_DIR)
+ENDIF (CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_INCLUDE_DIR AND CEGUI_OGRE_LIB_DIR)
 
 IF (WIN32) #Windows
@@ -41 +44 @@
 SET(CEGUI_OGRE_LIB_DIR ${CEGUI_OGRE_LIB_DIR} CACHE PATH "")
 
-IF (CEGUI_OGRE_INCLUDE_DIR AND CEGUI_OGRE_LIBRARIES)
+IF (CEGUI_OGRE_INCLUDE_DIR AND CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_LIB_DIR)
     SET(CEGUI_OGRE_FOUND TRUE)
-ENDIF (CEGUI_OGRE_INCLUDE_DIR AND CEGUI_OGRE_LIBRARIES)
+ENDIF (CEGUI_OGRE_INCLUDE_DIR AND CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_LIB_DIR)
 
 IF (CEGUI_OGRE_FOUND)
     IF (NOT CEGUI_OGRE_FIND_QUIETLY)
-        MESSAGE(STATUS "  libraries : ${CEGUI_OGRE_LIBRARIES} from ${CEGUI_OGRE_LIB_DIR}")
-        MESSAGE(STATUS "  includes  : ${CEGUI_OGRE_INCLUDE_DIR}")
+        MESSAGE(STATUS "CEGUI_Ogre was found.")
+        IF (VERBOSE_FIND)
+            MESSAGE (STATUS "  include path: ${CEGUI_OGRE_INCLUDE_DIR}")
+            MESSAGE (STATUS "  library path: ${CEGUI_OGRE_LIB_DIR}")
+            MESSAGE (STATUS "  libraries:    ${CEGUI_OGRE_LIBRARIES}")
+        ENDIF (VERBOSE_FIND)
     ENDIF (NOT CEGUI_OGRE_FIND_QUIETLY)
 ELSE (CEGUI_OGRE_FOUND)
-    IF (CEGUI_OGRE_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find CEGUI_OGRE")
-    ENDIF (CEGUI_OGRE_FIND_REQUIRED)
+    IF (NOT CEGUI_OGRE_INCLUDE_DIR)
+        MESSAGE(SEND_ERROR "CEGUI_Ogre include path was not found.")
+    ENDIF (NOT CEGUI_OGRE_INCLUDE_DIR)
+    IF (NOT CEGUI_OGRE_LIB_DIR)
+        MESSAGE(SEND_ERROR "CEGUI_Ogre library was not found.")
+    ENDIF (NOT CEGUI_OGRE_LIB_DIR)
+    IF (NOT CEGUI_OGRE_LIBRARIES)
+        MESSAGE(SEND_ERROR "CEGUI_Ogre libraries not known.")
+    ENDIF (NOT CEGUI_OGRE_LIBRARIES)
 ENDIF (CEGUI_OGRE_FOUND)