From d0d4eaec868d1691cc897596764269accec1991a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Feb 2015 15:44:03 -0800
Subject: [PATCH] fix AddPathsToLibPaths foreach, soxr requirements

---
 cmake/macros/AddPathsToLibPaths.cmake |  2 +-
 cmake/modules/FindSoxr.cmake          | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cmake/macros/AddPathsToLibPaths.cmake b/cmake/macros/AddPathsToLibPaths.cmake
index 93e3287b5a..e88fd06f95 100644
--- a/cmake/macros/AddPathsToLibPaths.cmake
+++ b/cmake/macros/AddPathsToLibPaths.cmake
@@ -10,7 +10,7 @@
 # 
 
 macro(ADD_PATHS_TO_LIB_PATHS)
-  foreach(_PATH in ${ARGN})
+  foreach(_PATH ${ARGN})
     set(TEMP_LIB_PATHS ${LIB_PATHS})
     list(APPEND TEMP_LIB_PATHS ${_PATH})
     set(LIB_PATHS ${TEMP_LIB_PATHS} CACHE TYPE LIST FORCE)
diff --git a/cmake/modules/FindSoxr.cmake b/cmake/modules/FindSoxr.cmake
index fba6158f14..b36c9465b7 100644
--- a/cmake/modules/FindSoxr.cmake
+++ b/cmake/modules/FindSoxr.cmake
@@ -25,11 +25,19 @@ find_path(SOXR_INCLUDE_DIRS soxr.h PATH_SUFFIXES include HINTS ${SOXR_SEARCH_DIR
 find_library(SOXR_LIBRARIES NAMES soxr PATH_SUFFIXES lib HINTS ${SOXR_SEARCH_DIRS})
 
 if (WIN32)
-  find_path(SOXR_DLL_PATH soxr.dll PATH_SUFFIXES bin HINTS ${SOXR_SEARCH_DIRS})
-  add_paths_to_lib_paths(${SOXR_DLL_PATH})
+  find_path(SOXR_DLL_PATH soxr.dll PATH_SUFFIXES bin HINTS ${SOXR_SEARCH_DIRS}) 
 endif()
 
+set(SOXR_REQUIREMENTS SOXR_INCLUDE_DIRS SOXR_LIBRARIES)
+if (WIN32)
+  list(APPEND SOXR_REQUIREMENTS SOXR_DLL_PATH)
+endif ()
+
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SOXR DEFAULT_MSG SOXR_INCLUDE_DIRS SOXR_LIBRARIES)
+find_package_handle_standard_args(SOXR DEFAULT_MSG ${SOXR_REQUIREMENTS})
+
+if (WIN32)
+  add_paths_to_lib_paths(${SOXR_DLL_PATH})
+endif ()
 
 mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS)
\ No newline at end of file