Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 09:43:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix AddPathsToLibPaths foreach, soxr requirements

Browse source
This commit is contained in:
Stephen Birarda 2015-02-17 15:44:03 -08:00
parent 10cdbc4fa0
commit d0d4eaec86
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/AddPathsToLibPaths.cmake
View file

@ -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)

14
cmake/modules/FindSoxr.cmake
View file

@ -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)