From: José Fonseca Date: Wed, 9 May 2012 08:23:38 +0000 (+0100) Subject: Find FXC executable. X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=62434cf83a94ace76f9b8558313af4d78b79e284;hp=d63a361f67ab8db48fe71c3b3de737f48257c4f8;p=apitrace Find FXC executable. --- diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index e0094c1..cbbe4f1 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,11 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") endif () + find_program (DirectX_FXC_EXECUTABLE fxc + PATHS ${DirectX_BIN_SEARCH_PATH} + DOC "Path to fxc.exe executable.") + + mark_as_advanced ( DirectX_D3D_INCLUDE_DIR DirectX_D3D_INCLUDE_DIR