From b717918298ad695c16f45d0664429a7b1591d050 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 5 Oct 2015 16:50:24 -0400 Subject: [PATCH] Try a more flexible DirectX search path setup. This is being done to get Appveyor to work. --- CMake/Modules/FindDirectX.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMake/Modules/FindDirectX.cmake b/CMake/Modules/FindDirectX.cmake index 8b8c1c8cbb..35be7fbbf3 100644 --- a/CMake/Modules/FindDirectX.cmake +++ b/CMake/Modules/FindDirectX.cmake @@ -10,16 +10,20 @@ if(NOT WIN32) return() endif() +# TODO: See if the paths listed below are enough. + set(DIRECTX_INCLUDE_SEARCH_PATHS # TODO: Do not be limited to x86 in the future. "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Include" "C:/DXSDK/Include" + "C:/Program Files (x86)/Microsoft DirectX SDK/Include" ) set(DIRECTX_LIBRARY_SEARCH_PATHS # TODO: Do not be limited to x86 in the future. "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Lib/x86" "C:/DXSDK/Include/Lib/x86" + "C:/Program Files (x86)/Microsoft DirectX SDK/Lib/x86" ) find_path(DIRECTX_INCLUDE_DIR