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

code/trunk/cmake/FindDirectX.cmake

@@ -5 +5 @@
   #   DirectX_INCLUDE_DIR  - include directory for DirectX
   #   DirectX_LIB_DIR      - lib directory for DirectX
+  #
+  # Several changes and additions by Fabian 'x3n' Landau
+  #                 > www.orxonox.net <
+
+  IF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR)
+    SET(DirectX_FIND_QUIETLY TRUE)
+  ENDIF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR)
 
   set(DirectX_FOUND "NO")
@@ -17 +24 @@
   )
 
-  if(DirectX_INCLUDE_DIR AND DirectX_LIB_DIR)
-    set(DirectX_FOUND "YES")
-  endif(DirectX_INCLUDE_DIR AND DirectX_LIB_DIR)
+  IF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR)
+    SET (DirectX_FOUND "YES")
+  ENDIF (DirectX_INCLUDE_DIR AND DirectX_LIB_DIR)
 
-  if (DirectX_FOUND)
-    if (NOT DirectX_FIND_QUIETLY)
-      message(STATUS "Found DirectX")
-    endif (NOT DirectX_FIND_QUIETLY)
-  else (DirectX_FOUND)
-    if (DirectX_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find DirectX")
-    else (DirectX_FOUNC)
-      message(STATUS "Could not find DirectX")
-    endif (DirectX_FIND_REQUIRED)
-  endif (DirectX_FOUND)
+  IF (DirectX_FOUND)
+    IF (NOT DirectX_FIND_QUIETLY)
+      MESSAGE(STATUS "DirectX was found.")
+      IF (VERBOSE_FIND)
+        MESSAGE (STATUS "  include path: ${DirectX_INCLUDE_DIR}")
+        MESSAGE (STATUS "  library path: ${DirectX_LIB_DIR}")
+        MESSAGE (STATUS "  libraries:    dinput8.lib")
+      ENDIF (VERBOSE_FIND)
+    ENDIF (NOT DirectX_FIND_QUIETLY)
+  ELSE (DirectX_FOUND)
+    IF (NOT DirectX_INCLUDE_DIR)
+      MESSAGE(SEND_ERROR "DirectX include path was not found.")
+    ENDIF (NOT DirectX_INCLUDE_DIR)
+    IF (NOT DirectX_LIB_DIR)
+      MESSAGE(SEND_ERROR "DirectX library was not found.")
+    ENDIF (NOT DirectX_LIB_DIR)
+  ENDIF (DirectX_FOUND)
 ENDIF(WIN32)