diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-05-11 11:39:27 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-05-11 11:44:51 -0400 |
| commit | c74810ca3fc7e5a3f6b84a3d3259294aaa9288be (patch) | |
| tree | df7664941fd413831cf83c9a6adb58c32728c5ce | |
| parent | 89452cecebab69159278fce5ca916a55090aaf29 (diff) | |
DRTVWR-476: Use find_library(dxguid) rather than find_path().
| -rw-r--r-- | indra/cmake/DirectX.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 201b157264..be9797b575 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -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}") |