From 4e5b28e8612dd5f32b51e445fdb7a4ec219324b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sat, 28 Apr 2012 22:57:42 +0100 Subject: [PATCH] Find DirectX 11.1 headers too. --- cmake/FindDirectX.cmake | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index d841af4..2d923c1 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -188,6 +188,21 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") endif () + find_path (DirectX_D3D11_1_INCLUDE_DIR d3d11_1.h + PATHS + "${DirectX_ROOT_DIR}/Include" + DOC "The directory where d3d11_1.h resides") + + find_library (DirectX_D3D11_1_LIBRARY d3d11_1 + PATHS + "${DirectX_ROOT_DIR}/Lib/${DirectX_ARCHITECTURE}" + DOC "The directory where d3d11_1 resides") + + if (DirectX_D3D11_1_INCLUDE_DIR AND DirectX_D3D11_1_LIBRARY) + set (DirectX_D3D11_1_FOUND 1) + endif () + + mark_as_advanced( DirectX_D3D_INCLUDE_DIR DirectX_D3D_INCLUDE_DIR @@ -219,6 +234,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") DirectX_D3D11_LIBRARY DirectX_D3DX11_INCLUDE_DIR DirectX_D3DX11_LIBRARY + DirectX_D3D11_1_INCLUDE_DIR + DirectX_D3D11_1_LIBRARY ) endif () @@ -235,4 +252,5 @@ mark_as_advanced ( DirectX_D3D10_1_FOUND DirectX_D3D11_FOUND DirectX_D3DX11_FOUND + DirectX_D3D11_1_FOUND ) -- 2.43.0