Added TBB (UPDATE) 7

Author: Nesterov Alexander

CMakeLists.txt

@@ -4,7 +4,7 @@ message( STATUS "Parallel Programming Course" )
 
 if( CMAKE_VERSION VERSION_LESS "3.1" )
     if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
     endif( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
 else( CMAKE_VERSION VERSION_LESS "3.1" )
     set( CMAKE_CXX_STANDARD 11 )
@@ -22,29 +22,21 @@ if( OpenMP_FOUND )
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 endif( OpenMP_FOUND )
 
-set(TBB_OS_DEFINE "")
-if( UNIX )
-    set(TBB_OS_DEFINE "_lin")
-endif( UNIX )
 if( WIN32 )
-    set(TBB_OS_DEFINE "_win")
+    set( TBB_VERSION_ELEM "tbb2018_20171205oss")
+    set( TBB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/tbb_downloaded/${TBB_VERSION_ELEM}_win" )
+    include( cmake/TBBGet.cmake )
+    tbb_get( TBB_ROOT tbb_root RELEASE_TAG "2018_U2" CONFIG_DIR TBB_DIR )
+    find_package( TBB )
+else( WIN32 )
+    include( cmake/FindTBB.cmake )
+    if( TBB_FOUND )
+        message(STATUS "Found TBB: TRUE (found version \"${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR}\") ")
+        include_directories( ${TBB_INCLUDE_DIRS} )
+    else( TBB_FOUND )
+        message(STATUS "Not found TBB")
+    endif( TBB_FOUND )
 endif( WIN32 )
-if( APPLE )
-    set(TBB_OS_DEFINE "_mac")
-endif( APPLE )
-
-set( TBB_VERSION_ELEM "tbb2018_20171205oss")
-set( TBB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/tbb_downloaded/${TBB_VERSION_ELEM}${TBB_OS_DEFINE}" )
-include( cmake/TBBGet.cmake )
-tbb_get( TBB_ROOT tbb_root RELEASE_TAG "2018_U2" CONFIG_DIR TBB_DIR )
-find_package( TBB )
-
-if( TBB_FOUND )
-    message(STATUS "Found TBB: TRUE (found version \"${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR}\") ")
-    include_directories( ${TBB_INCLUDE_DIRS} )
-else( TBB_FOUND )
-    message(STATUS "Not found TBB")
-endif( TBB_FOUND )
 
 if( UNIX )
     set(CMAKE_C_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -Werror")

modules/test_tasks/tbb/CMakeLists.txt

@@ -3,4 +3,8 @@ project( tbb )
 message( STATUS "-- " ${PROJECT_NAME} )
 add_executable( ${PROJECT_NAME} main.cpp )
 
-target_link_libraries(tbb ${TBB_IMPORTED_TARGETS})
+if( WIN32 )
+    target_link_libraries(tbb ${TBB_IMPORTED_TARGETS})
+else( WIN32 )
+    target_link_libraries(tbb ${TBB_LIBRARIES})
+endif( WIN32 )