livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-476: Use find_library(dxguid) rather than find_path().

meow-7.2.2
Nat Goodspeed 2020-05-11 11:39:27 -04:00
parent 89452ceceb
commit c74810ca3f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/cmake/DirectX.cmake
View File

@ -11,10 +11,11 @@ if (WINDOWS)
endif (DIRECTX_INCLUDE_DIR)
# dxhint isn't meant to be the hard-coded DIRECTX_LIBRARY_DIR, we're just
# suggesting it as a hint to the next find_path(). The version is embedded
# in the DIRECTX_INCLUDE_DIR path string after Include and Lib, which is why
# we don't just append a relative path: if there are multiple versions
# installed on the host, we need to be sure we're using THE SAME version.
# suggesting it as a hint to find_library(). The Windows SDK version number
# is embedded in the DIRECTX_INCLUDE_DIR path string after Include and Lib,
# which is why we don't just append a relative path: if there are multiple
# versions installed on the host, we need to be sure we're using THE SAME
# version.
string(REPLACE "/Include/" "/Lib/" dxhint "${DIRECTX_INCLUDE_DIR}")
if (ADDRESS_SIZE EQUAL 32)
set(archdir x86)
@ -22,7 +23,8 @@ if (WINDOWS)
set(archdir x64)
endif()
string(APPEND dxhint "/${archdir}")
find_path(DIRECTX_LIBRARY_DIR dxguid.lib HINTS "${dxhint}")
find_library(DXGUID_LIBRARY dxguid HINTS "${dxhint}")
get_filename_component(DIRECTX_LIBRARY_DIR "${DXGUID_LIBRARY}" DIRECTORY)
if (DIRECTX_LIBRARY_DIR)
if (NOT DIRECTX_FIND_QUIETLY)
message(STATUS "Found DirectX library: ${DIRECTX_LIBRARY_DIR}")