X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=cmake%2FFindDirectX.cmake;h=e71a7733dbda7e649a7920a69554f8f2227fe32a;hb=65321858f558e0851a27158cbf3d207f530148e8;hp=e0094c18251f93df1c5227ced812607d0ed00e57;hpb=e274899e458336950a89dbed817f512d82ef09e1;p=apitrace

diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake
index e0094c1..e71a773 100644
--- a/cmake/FindDirectX.cmake
+++ b/cmake/FindDirectX.cmake
@@ -39,6 +39,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	if (DirectX_ROOT_DIR)
 		set (DirectX_INC_SEARCH_PATH "${DirectX_ROOT_DIR}/Include")
 		set (DirectX_LIB_SEARCH_PATH "${DirectX_ROOT_DIR}/Lib/${DirectX_ARCHITECTURE}")
+		set (DirectX_BIN_SEARCH_PATH "${DirectX_ROOT_DIR}/Utilities/bin/x86")
 	endif ()
 
 
@@ -60,6 +61,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 		if (WIN8_SDK_ROOT_DIR)
 			set (DirectX_INC_SEARCH_PATH "${WIN8_SDK_ROOT_DIR}/Include/um" "${WIN8_SDK_ROOT_DIR}/Include/shared")
 			set (DirectX_LIB_SEARCH_PATH "${WIN8_SDK_ROOT_DIR}/Lib/Win8/um/${DirectX_ARCHITECTURE}")
+			set (DirectX_BIN_SEARCH_PATH "${WIN8_SDK_ROOT_DIR}/bin/x86")
 		endif ()
 	endif ()
 
@@ -206,6 +208,24 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	endif ()
 
 
+	find_program (DirectX_FXC_EXECUTABLE fxc
+		PATHS ${DirectX_BIN_SEARCH_PATH}
+		DOC "Path to fxc.exe executable.")
+
+
+	find_path (DirectX_D2D1_INCLUDE_DIR d2d1.h
+		PATHS ${DirectX_INC_SEARCH_PATH}
+		DOC "The directory where d2d1.h resides")
+
+	find_library (DirectX_D2D1_LIBRARY d2d1
+		PATHS ${DirectX_LIB_SEARCH_PATH}
+		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
@@ -238,6 +258,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
 	)
 
 
@@ -257,6 +279,7 @@ mark_as_advanced (
 	DirectX_D3D11_FOUND
 	DirectX_D3DX11_FOUND
 	DirectX_D3D11_1_FOUND
+	DirectX_D2D1_FOUND
 )