Merge remote-tracking branch 'github/master' into d2d

[apitrace] / cmake / FindDirectX.cmake

diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake
index cbbe4f134506e6f4c2d7a3e52b1c1f8a8f37c77a..43472fad19306fcea027928943717dd9ef0be8e1 100644 (file)
--- a/cmake/FindDirectX.cmake
+++ b/cmake/FindDirectX.cmake
@@ -213,6 +213,21 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
                DOC "Path to fxc.exe executable.")
 
 
+       find_path (DirectX_D2D1_INCLUDE_DIR d2d1.h
+               PATHS
+                       "${DirectX_ROOT_DIR}/Include"
+               DOC "The directory where d2d1.h resides")
+
+       find_library (DirectX_D2D1_LIBRARY d2d1
+               PATHS
+                       "${DirectX_ROOT_DIR}/Lib/x86"
+               DOC "The directory where d2d1 resides")
+
+       if (DirectX_D2D1_INCLUDE_DIR AND DirectX_D2D1_LIBRARY)
+               set (DirectX_D2D1_FOUND 1)
+       endif (DirectX_D2D1_INCLUDE_DIR AND DirectX_D2D1_LIBRARY)
+
+
        mark_as_advanced (
                DirectX_D3D_INCLUDE_DIR
                DirectX_D3D_INCLUDE_DIR
@@ -245,6 +260,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
                DirectX_D3DX11_INCLUDE_DIR
                DirectX_D3DX11_LIBRARY
                DirectX_D3D11_1_INCLUDE_DIR
+               DirectX_D2D1_INCLUDE_DIR
+               DirectX_D2D1_LIBRARY
        )
 
 
@@ -264,6 +281,7 @@ mark_as_advanced (
        DirectX_D3D11_FOUND
        DirectX_D3DX11_FOUND
        DirectX_D3D11_1_FOUND
+       DirectX_D2D1_FOUND
 )