Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 03:12:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use shared soxr to avoid openmp link

Browse source
This commit is contained in:
Stephen Birarda 2015-01-28 14:59:23 -08:00
parent c06ba0307e
commit ad0ae76b00
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD_ANDROID.md
View file

@ -93,7 +93,7 @@ From the soxr directory, use cmake, along with the `android.toolchain.cmake` fil
The full set of commands to build soxr for Android is shown below. It is a long command, make sure you copy the entire command (up to `-DBUILD_TESTS=0`).
```
cmake -DCMAKE_TOOLCHAIN_FILE=$FULL_PATH_TO_TOOLCHAIN -DCMAKE_INSTALL_PREFIX=. -DBUILD_SHARED_LIBS=OFF -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 -DBUILD_TESTS=0
cmake -DCMAKE_TOOLCHAIN_FILE=$FULL_PATH_TO_TOOLCHAIN -DCMAKE_INSTALL_PREFIX=. -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 -DBUILD_TESTS=0
make
make install
```

13
cmake/modules/FindSoxr.cmake
View file

@ -22,20 +22,9 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("soxr")
find_path(SOXR_INCLUDE_DIRS soxr.h PATH_SUFFIXES include HINTS ${SOXR_SEARCH_DIRS})
if (ANDROID)
set(SOXR_NAMES "libsoxr.a")
elseif ()
set(SOXR_NAMES "soxr")
endif ()
find_library(SOXR_LIBRARIES NAMES ${SOXR_NAMES} PATH_SUFFIXES lib 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)
if (ANDROID)
set(SOXR_LIBRARIES ${SOXR_LIBRARIES} "-fopenmp")
endif ()
mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS)