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

code/trunk/cmake/FindOGRE.cmake

@@ -11 +11 @@
 #
 # 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 (OGRE_LIBRARIES AND OGRE_INCLUDE_DIR)
-    SET(OGRE_FIND_QUIETLY TRUE) # Already in cache, be silent
-ENDIF (OGRE_LIBRARIES AND OGRE_INCLUDE_DIR)
+IF (OGRE_LIBRARIES AND OGRE_INCLUDE_DIR AND OGRE_LIB_DIR)
+    SET (OGRE_FIND_QUIETLY TRUE) # Already in cache, be silent
+ENDIF (OGRE_LIBRARIES AND OGRE_INCLUDE_DIR AND OGRE_LIB_DIR)
 
 IF (WIN32) #Windows
-    MESSAGE(STATUS "Looking for OGRE")
-    SET(OGRE_INCLUDE_DIR ../libs/ogre/OgreMain/include)
-    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
+    FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
+        ../libs/ogre/OgreMain/include
+    )
+
     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
+    FIND_LIBRARY(OGRE_LIBDIR NAMES ${OGRE_LIBRARIES} PATHS
+        ../libs/ogre/Samples/Common/bin/Release
+    )
+
+    # Strip the filename from the path
+    IF (OGRE_LIBDIR)
+        GET_FILENAME_COMPONENT(OGRE_LIBDIR ${OGRE_LIBDIR} PATH)
+        SET (OGRE_LIB_DIR ${OGRE_LIBDIR} CACHE FILEPATH "")
+    ENDIF (OGRE_LIBDIR)
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
@@ -26 +39 @@
     SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIRS})
     SET(OGRE_LIB_DIR ${OGRE_LIBDIR})
-    SET(OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")
+    SET(OGRE_LIBRARIES ${OGRE_LIBRARIES})
 ENDIF (WIN32)
 
@@ -33 +46 @@
 SEPARATE_ARGUMENTS(OGRE_LIBRARIES)
 
-SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} CACHE PATH "")
-SET(OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")
-SET(OGRE_LIB_DIR ${OGRE_LIB_DIR} CACHE PATH "")
+SET (OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} CACHE PATH "")
+SET (OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")
+SET (OGRE_LIB_DIR ${OGRE_LIB_DIR} CACHE PATH "")
 
-IF (OGRE_INCLUDE_DIR AND OGRE_LIBRARIES)
+IF (OGRE_INCLUDE_DIR AND OGRE_LIBRARIES AND OGRE_LIB_DIR)
     SET(OGRE_FOUND TRUE)
-ENDIF (OGRE_INCLUDE_DIR AND OGRE_LIBRARIES)
+ENDIF (OGRE_INCLUDE_DIR AND OGRE_LIBRARIES AND OGRE_LIB_DIR)
 
 IF (OGRE_FOUND)
     IF (NOT OGRE_FIND_QUIETLY)
-        MESSAGE(STATUS "  libraries : ${OGRE_LIBRARIES} from ${OGRE_LIB_DIR}")
-        MESSAGE(STATUS "  includes  : ${OGRE_INCLUDE_DIR}")
+        MESSAGE(STATUS "Ogre was found.")
+        IF (VERBOSE_FIND)
+            MESSAGE (STATUS "  include path: ${OGRE_INCLUDE_DIR}")
+            MESSAGE (STATUS "  library path: ${OGRE_LIB_DIR}")
+            MESSAGE (STATUS "  libraries:    ${OGRE_LIBRARIES}")
+        ENDIF (VERBOSE_FIND)
     ENDIF (NOT OGRE_FIND_QUIETLY)
 ELSE (OGRE_FOUND)
-    IF (OGRE_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find OGRE")
-    ENDIF (OGRE_FIND_REQUIRED)
+    IF (NOT OGRE_INCLUDE_DIR)
+        MESSAGE(SEND_ERROR "Ogre include path was not found.")
+    ENDIF (NOT OGRE_INCLUDE_DIR)
+    IF (NOT OGRE_LIB_DIR)
+        MESSAGE(SEND_ERROR "Ogre library was not found.")
+    ENDIF (NOT OGRE_LIB_DIR)
+    IF (NOT OGRE_LIBRARIES)
+        MESSAGE(SEND_ERROR "Ogre libraries not known.")
+    ENDIF (NOT OGRE_LIBRARIES)
 ENDIF (OGRE_FOUND)