From c74810ca3fc7e5a3f6b84a3d3259294aaa9288be Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 11 May 2020 11:39:27 -0400
Subject: [PATCH] DRTVWR-476: Use find_library(dxguid) rather than find_path().
---
indra/cmake/DirectX.cmake | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake
index 201b157264b..be9797b575c 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}")
--
GitLab