From 3201d7219dad9d52fc5480ca6c71d078d2022a00 Mon Sep 17 00:00:00 2001
From: Sam Yates <halfflat@gmail.com>
Date: Thu, 27 Oct 2016 10:58:39 +0200
Subject: [PATCH] Add "lib" to search prefixes for libtbb
* Fix quoting error in library search.
* Add "lib" to prefixes when system is "Linux".
---
cmake/FindTBB.cmake | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
index 61caa664..dadc3661 100644
--- a/cmake/FindTBB.cmake
+++ b/cmake/FindTBB.cmake
@@ -158,6 +158,7 @@ if(NOT TBB_FOUND)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
set(TBB_LIB_PATH_SUFFIX "lib/ia32/gcc4.4")
endif()
+ list(APPEND TBB_LIB_PATH_SUFFIX "lib")
endif()
##################################
@@ -179,12 +180,12 @@ if(NOT TBB_FOUND)
find_library(TBB_${_comp}_LIBRARY_RELEASE ${_comp}
HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
- PATH_SUFFIXES "${TBB_LIB_PATH_SUFFIX}")
+ PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX})
find_library(TBB_${_comp}_LIBRARY_DEBUG ${_comp}_debug
HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
- PATH_SUFFIXES "${TBB_LIB_PATH_SUFFIX}")
+ PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX})
# Set the library to be used for the component
--
GitLab