From 60fc4d2c1c65a8b1c50451559be92c24252cd192 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 18 Feb 2015 13:54:30 -0800 Subject: [PATCH] attempt to handle android via tbb binaries --- cmake/externals/tbb/CMakeLists.txt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/cmake/externals/tbb/CMakeLists.txt b/cmake/externals/tbb/CMakeLists.txt index 52c01227ea..d8b1fa6983 100644 --- a/cmake/externals/tbb/CMakeLists.txt +++ b/cmake/externals/tbb/CMakeLists.txt @@ -3,17 +3,14 @@ set(EXTERNAL_NAME tbb) if (APPLE) set(DOWNLOAD_URL https://www.threadingbuildingblocks.org/sites/default/files/software_releases/mac/tbb43_20150209oss_osx.tgz) elseif (WIN32) - -elseif (UNIX) - -elseif (ANDROID) - + set(DOWNLOAD_URL https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/tbb43_20150209oss_win.zip) +else() + set(DOWNLOAD_URL https://www.threadingbuildingblocks.org/sites/default/files/software_releases/linux/tbb43_20150209oss_lin.tgz) endif () include(ExternalProject) ExternalProject_Add( ${EXTERNAL_NAME} - PREFIX ${EXTERNAL_NAME} URL ${DOWNLOAD_URL} BUILD_COMMAND "" CONFIGURE_COMMAND "" @@ -36,6 +33,15 @@ elseif (WIN32) # set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/soxr.lib CACHE TYPE "List of soxr libraries") # set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${INSTALL_DIR}/bin CACHE TYPE "Path to soxr dll") +elseif (ANDROID) + set(_TBB_ANDROID_LIB_PATH "${SOURCE_DIR}/lib/android/x86_64") + + set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${_TBB_ANDROID_LIB_PATH}/libtbb_debug.so CACHE TYPE "TBB debug library location") + set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${_TBB_ANDROID_LIB_PATH}/libtbb.so CACHE TYPE "TBB release library location") + set(${EXTERNAL_NAME_UPPER}_MALLOC_LIBRARY_DEBUG ${_TBB_ANDROID_LIB_PATH}/libtbbmalloc_debug.so CACHE TYPE "TBB malloc debug library location") + set(${EXTERNAL_NAME_UPPER}_MALLOC_LIBRARY_RELEASE ${_TBB_ANDROID_LIB_PATH}/libtbbmalloc.so CACHE TYPE "TBB malloc release library location") +elseif (UNIX) + else () - # set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.so CACHE TYPE "List of soxr libraries") -endif () \ No newline at end of file + message(STATUS "Your OS is not handled by our TBB external project CMakeLists.txt. Please install TBB yourself and pass -DGET_TBB=0 when running CMake.") +endif () \ No newline at end of file