cmake: Detect and require d3d11_4.h include.

KDABLabs · Oct 11, 2017 · 5020c0d · 5020c0d
1 parent 4252663
commit 5020c0d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,8 +140,9 @@ if (WIN32)
 
     find_package (DirectX)
 
-    if (MSVC AND NOT DirectX_D3D11_3_INCLUDE_FOUND)
-        message (FATAL_ERROR "Windows 10 SDK must be selected (-DCMAKE_SYSTEM_VERSION=10.0) for D3D11.3 support")
+    if (MSVC AND NOT DirectX_D3D11_4_INCLUDE_FOUND)
+        # XXX: is it might be necessary to explicitely select it via -DCMAKE_SYSTEM_VERSION=?
+        message (FATAL_ERROR "Windows 10.0.14393 SDK or newer is required for D3D11.4 support")
     endif ()
 
     set (ENABLE_EGL false)

diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake
@@ -113,7 +113,7 @@ if (WIN32)
 
     find_winsdk_header  (D3D9    d3d9.h)
 
-    find_winsdk_header  (D3D11_3 d3d11_3.h)
+    find_winsdk_header  (D3D11_4 d3d11_4.h)
 
     find_winsdk_header  (D2D1_1  d2d1_1.h)
 

diff --git a/dispatch/d3d11imports.hpp b/dispatch/d3d11imports.hpp
@@ -34,7 +34,7 @@
 
 #include "winsdk_compat.h"
 
-#include <d3d11_3.h>
+#include <d3d11_4.h>
 
 
 #include "dxgiint.h"

diff --git a/dispatch/dxgiint.h b/dispatch/dxgiint.h
@@ -30,7 +30,7 @@
 
 #include "winsdk_compat.h"
 
-#include <dxgi1_4.h>
+#include <dxgi1_5.h>
 
 
 DEFINE_GUID(IID_IDXGISwapChainDWM,0xF69F223B,0x45D3,0x4AA0,0x98,0xC8,0xC4,0x0C,0x2B,0x23,0x10,0x29);

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
@@ -271,10 +271,10 @@ if (WIN32)
             ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
-    if (DirectX_D3D11_3_INCLUDE_FOUND)
+    if (DirectX_D3D11_4_INCLUDE_FOUND)
         add_definitions (-DHAVE_DXGI)
         include_directories (BEFORE SYSTEM
-            ${DirectX_D3D11_3_INCLUDE_DIR}
+            ${DirectX_D3D11_4_INCLUDE_DIR}
             ${CMAKE_SOURCE_DIR}/thirdparty/directxtex/DirectXTex
         )
         set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
@@ -336,7 +336,7 @@ if (WIN32)
         retrace_common
         d3dhelpers
     )
-    if (DirectX_D3D11_3_INCLUDE_FOUND)
+    if (DirectX_D3D11_4_INCLUDE_FOUND)
         target_link_libraries (d3dretrace directxtex)
     endif ()
 

diff --git a/thirdparty/directxtex/CMakeLists.txt b/thirdparty/directxtex/CMakeLists.txt
@@ -1,6 +1,6 @@
 include (CheckIncludeFileCXX)
 
-if (DirectX_D3D11_3_INCLUDE_FOUND)
+if (DirectX_D3D11_4_INCLUDE_FOUND)
 
     include_directories (BEFORE
         ${DirectX_D3D11_INCLUDE_DIR}

diff --git a/thirdparty/dxerr/CMakeLists.txt b/thirdparty/dxerr/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_definitions (-DHAVE_DDRAW)
 add_definitions (-DHAVE_D3D9)
 
-if (DirectX_D3D11_3_INCLUDE_FOUND)
-    include_directories (BEFORE SYSTEM ${DirectX_D3D11_3_INCLUDE_DIR})
+if (DirectX_D3D11_4_INCLUDE_FOUND)
+    include_directories (BEFORE SYSTEM ${DirectX_D3D11_4_INCLUDE_DIR})
     add_definitions (-DHAVE_D3D10_1)
     add_definitions (-DHAVE_D3D11_1)
 endif ()

diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
@@ -202,8 +202,8 @@ if (WIN32)
     endif ()
 
     # dxgi.dll, d3d10.dll, d3d10_1.dll, d3d11.dll
-    if (DirectX_D3D11_3_INCLUDE_FOUND)
-        include_directories (BEFORE SYSTEM ${DirectX_D3D11_3_INCLUDE_DIR})
+    if (DirectX_D3D11_4_INCLUDE_FOUND)
+        include_directories (BEFORE SYSTEM ${DirectX_D3D11_4_INCLUDE_DIR})
 
         add_custom_command (
             OUTPUT dxgitrace.cpp