Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 22:33:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

look for soxr and not redundant libsoxr

Browse source
This commit is contained in:
Stephen Birarda 2015-01-22 14:09:29 -08:00
parent c82ac27104
commit 102f076412
3 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cmake/modules/FindLibSoxr.cmake
View file

@ -1,30 +0,0 @@
#
# FindLibsoxr.cmake
#
# Try to find the libsoxr resampling library
#
# You can provide a LIBSOXR_ROOT_DIR which contains lib and include directories
#
# Once done this will define
#
# LIBSOXR_FOUND - system found libsoxr
# LIBSOXR_INCLUDE_DIRS - the libsoxr include directory
# LIBSOXR_LIBRARIES - link to this to use libsoxr
#
# Created on 1/22/2015 by Stephen Birarda
# Copyright 2015 High Fidelity, Inc.
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("libsoxr")
find_path(LIBSOXR_INCLUDE_DIRS soxr.h PATH_SUFFIXES include HINTS ${LIBSOXR_SEARCH_DIRS})
find_library(LIBSOXR_LIBRARIES NAMES soxr PATH_SUFFIXES lib HINTS ${LIBSOXR_SEARCH_DIRS})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libsoxr DEFAULT_MSG LIBSOXR_INCLUDE_DIRS LIBSOXR_LIBRARIES)
mark_as_advanced(LIBSOXR_INCLUDE_DIRS LIBSOXR_LIBRARIES LIBSOXR_SEARCH_DIRS)

30
cmake/modules/FindSoxr.cmake Normal file
View file

@ -0,0 +1,30 @@
#
# FindSoxr.cmake
#
# Try to find the libsoxr resampling library
#
# You can provide a LIBSOXR_ROOT_DIR which contains lib and include directories
#
# Once done this will define
#
# SOXR_FOUND - system found libsoxr
# SOXR_INCLUDE_DIRS - the libsoxr include directory
# SOXR_LIBRARIES - link to this to use libsoxr
#
# Created on 1/22/2015 by Stephen Birarda
# Copyright 2015 High Fidelity, Inc.
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
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})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(soxr DEFAULT_MSG SOXR_INCLUDE_DIRS SOXR_LIBRARIES)
mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS)

6
libraries/audio-client/CMakeLists.txt
View file

@ -21,9 +21,9 @@ target_link_libraries(${TARGET_NAME} gverb)
list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${GVERB_INCLUDE_DIRS}")
# we use libsoxr for resampling
find_package(LibSoxr REQUIRED)
target_link_libraries(${TARGET_NAME} ${LIBSOXR_LIBRARIES})
include_directories(SYSTEM ${LIBSOXR_INCLUDE_DIRS})
find_package(Soxr REQUIRED)
target_link_libraries(${TARGET_NAME} ${SOXR_LIBRARIES})
include_directories(SYSTEM ${SOXR_INCLUDE_DIRS})
# call macro to include our dependency includes and bubble them up via a property on our target
include_dependency_includes()