actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #839 from Prcuvu/read_dxsdk_dir_env

Browse Source 
Read DirectX SDK path from environment variable.
This commit is contained in:
Jason Felds
2015-10-06 16:43:09 -04:00
parent 8df4931ea3 05ae23d1c4
commit dd0d2ed67f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/Modules/FindDirectX.cmake
+5 -7
View File
@@ -10,20 +10,18 @@ if(NOT WIN32)
return() return()
endif() endif()
# TODO: See if the paths listed below are enough. if(NOT EXISTS "$ENV{DXSDK_DIR}")
message(FATAL_ERROR "Could not find Microsoft DirectX SDK installation!")
endif()
set(DIRECTX_INCLUDE_SEARCH_PATHS set(DIRECTX_INCLUDE_SEARCH_PATHS
# TODO: Do not be limited to x86 in the future. # TODO: Do not be limited to x86 in the future.
"C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Include" "$ENV{DXSDK_DIR}/Include"
"C:/DXSDK/Include"
"C:/Program Files (x86)/Microsoft DirectX SDK/Include"
) )
set(DIRECTX_LIBRARY_SEARCH_PATHS set(DIRECTX_LIBRARY_SEARCH_PATHS
# TODO: Do not be limited to x86 in the future. # TODO: Do not be limited to x86 in the future.
"C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Lib/x86" "$ENV{DXSDK_DIR}/Lib/x86"
"C:/DXSDK/Include/Lib/x86"
"C:/Program Files (x86)/Microsoft DirectX SDK/Lib/x86"
) )
find_path(DIRECTX_INCLUDE_DIR find_path(DIRECTX_INCLUDE_DIR