From 671734ba441b542e98876dc08052b860c4f38c68 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 19 Jan 2015 12:01:24 -0800 Subject: [PATCH] fix TBB find module for android build --- cmake/modules/FindTBB.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index de21369780..03ac99b73c 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -28,7 +28,7 @@ set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc") if (APPLE) set(_TBB_LIB_DIR "lib/libc++") -elseif (UNIX) +elseif (UNIX AND NOT ANDROID) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_TBB_ARCH_DIR "intel64") else() @@ -59,6 +59,7 @@ elseif (WIN32) elseif (ANDROID) set(_TBB_DEFAULT_INSTALL_DIR "/tbb") set(_TBB_LIB_NAME "tbb") + set(_TBB_LIB_DIR "lib") set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc") set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug") set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")