Skip to content
Snippets Groups Projects
Commit c74810ca authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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

parent 89452cec
No related branches found
No related tags found
No related merge requests found
...@@ -11,10 +11,11 @@ if (WINDOWS) ...@@ -11,10 +11,11 @@ if (WINDOWS)
endif (DIRECTX_INCLUDE_DIR) endif (DIRECTX_INCLUDE_DIR)
# dxhint isn't meant to be the hard-coded DIRECTX_LIBRARY_DIR, we're just # 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 # suggesting it as a hint to find_library(). The Windows SDK version number
# in the DIRECTX_INCLUDE_DIR path string after Include and Lib, which is why # is embedded in the DIRECTX_INCLUDE_DIR path string after Include and Lib,
# we don't just append a relative path: if there are multiple versions # which is why we don't just append a relative path: if there are multiple
# installed on the host, we need to be sure we're using THE SAME version. # versions installed on the host, we need to be sure we're using THE SAME
# version.
string(REPLACE "/Include/" "/Lib/" dxhint "${DIRECTX_INCLUDE_DIR}") string(REPLACE "/Include/" "/Lib/" dxhint "${DIRECTX_INCLUDE_DIR}")
if (ADDRESS_SIZE EQUAL 32) if (ADDRESS_SIZE EQUAL 32)
set(archdir x86) set(archdir x86)
...@@ -22,7 +23,8 @@ if (WINDOWS) ...@@ -22,7 +23,8 @@ if (WINDOWS)
set(archdir x64) set(archdir x64)
endif() endif()
string(APPEND dxhint "/${archdir}") 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 (DIRECTX_LIBRARY_DIR)
if (NOT DIRECTX_FIND_QUIETLY) if (NOT DIRECTX_FIND_QUIETLY)
message(STATUS "Found DirectX library: ${DIRECTX_LIBRARY_DIR}") message(STATUS "Found DirectX library: ${DIRECTX_LIBRARY_DIR}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment