From 801ab0e2b99efe95bff60185360a64169bfaefda Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Feb 2015 14:30:20 -0800
Subject: [PATCH] windows unhelpfully puts soxr dll in bin, not lib
---
cmake/externals/soxr/CMakeLists.txt | 1 +
cmake/modules/FindSoxr.cmake | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cmake/externals/soxr/CMakeLists.txt b/cmake/externals/soxr/CMakeLists.txt
index 03b49bd7d1..fcd28d4db5 100644
--- a/cmake/externals/soxr/CMakeLists.txt
+++ b/cmake/externals/soxr/CMakeLists.txt
@@ -20,6 +20,7 @@ set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING
if (WIN32)
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/soxr.lib CACHE TYPE STRING)
+ set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${INSTALL_DIR}/bin CACHE TYPE STRING)
elseif (APPLE)
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.dylib CACHE TYPE STRING)
else ()
diff --git a/cmake/modules/FindSoxr.cmake b/cmake/modules/FindSoxr.cmake
index cfe0428ebc..b980b4ea1f 100644
--- a/cmake/modules/FindSoxr.cmake
+++ b/cmake/modules/FindSoxr.cmake
@@ -24,10 +24,10 @@ hifi_library_search_hints("soxr")
find_path(SOXR_INCLUDE_DIRS soxr.h PATH_SUFFIXES include HINTS ${SOXR_SEARCH_DIRS})
find_library(SOXR_LIBRARIES NAMES soxr PATH_SUFFIXES lib HINTS ${SOXR_SEARCH_DIRS})
-if (NOT DEFINED SOXR_LIB_PATH)
- get_filename_component(SOXR_LIB_PATH ${SOXR_LIBRARIES} DIRECTORY CACHE)
- add_path_to_lib_paths(${SOXR_LIB_PATH})
-endif ()
+if (WIN32)
+ find_path(SOXR_DLL_PATH soxr.dll PATH_SUFFIXES bin HINTS ${SOXR_SEARCH_DIRS})
+ add_path_to_lib_paths(${SOXR_DLL_PATH})
+endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SOXR DEFAULT_MSG SOXR_INCLUDE_DIRS SOXR_LIBRARIES)