Browse Source

Do not treat DirectX SDK not found as a fatal error, as it is still possible to compile if eg. Windows 8 SDK is installed instead.

Lasse Öörni 12 years ago
parent
commit
9afac28ea0

+ 3 - 5
Source/CMake/Modules/FindDirect3D.cmake

@@ -67,12 +67,10 @@ if (WIN32)
 
     if (DIRECT3D_FOUND)
         include (FindPackageMessage)
-        FIND_PACKAGE_MESSAGE (Direct3D "Found Microsoft Direct3D: ${DIRECT3D_LIBRARIES} ${DIRECT3D_INCLUDE_DIR}" "[${DIRECT3D_LIBRARIES}][${DIRECT3D_INCLUDE_DIR}]")
+        FIND_PACKAGE_MESSAGE (Direct3D "Found DirectX SDK: ${DIRECT3D_LIBRARIES} ${DIRECT3D_INCLUDE_DIR}" "[${DIRECT3D_LIBRARIES}][${DIRECT3D_INCLUDE_DIR}]")
     else ()
-        if (Direct3D_FIND_REQUIRED)
-            message (FATAL_ERROR "Could not find Microsoft Direct3D")
-        endif ()
+        message ("-- DirectX SDK not found. This is not fatal if a recent Windows SDK is installed")
     endif ()
- 
+
     mark_as_advanced (DIRECT3D_INCLUDE_DIR DIRECT3D_LIBRARIES)
 endif ()

+ 8 - 4
Source/CMake/Modules/Urho3D-CMake-magic.cmake

@@ -80,13 +80,17 @@ if (NOT WIN32)
 endif ()
 
 # If using Windows and not OpenGL, find DirectX SDK include & library directories
+# Note: if a recent Windows SDK is installed instead, it will be possible to compile without;
+# therefore do not log a fatal error in that case
 if (WIN32 AND NOT USE_OPENGL)
-    find_package (Direct3D REQUIRED)
-    include_directories (${DIRECT3D_INCLUDE_DIR})
-    link_directories (${DIRECT3D_LIBRARY_DIR})
+    find_package (Direct3D)
+    if (DIRECT3D_FOUND)
+        include_directories (${DIRECT3D_INCLUDE_DIR})
+        link_directories (${DIRECT3D_LIBRARY_DIR})
+    endif ()
 endif ()
 
-# For Raspbery Pi, find Broadcom VideoCore IV firmware 
+# For Raspbery Pi, find Broadcom VideoCore IV firmware
 if (RASPI)
     find_package (BCM_VC REQUIRED)
     link_directories (${BCM_VC_LIBRARY_DIR})