Get rid of TBB references

AcademySoftwareFoundation · May 8, 2013 · 85bcea9 · 85bcea9
1 parent caa93d7
commit 85bcea9
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 57 deletions.
diff --git a/Makefile b/Makefile
@@ -44,10 +44,6 @@ MY_CMAKE_FLAGS += -DVERBOSE:BOOL=1
 TEST_FLAGS += -V
 endif
 
-ifneq (${USE_TBB},)
-MY_CMAKE_FLAGS += -DUSE_TBB:BOOL=${USE_TBB}
-endif
-
 ifneq (${LLVM_DIRECTORY},)
 MY_CMAKE_FLAGS += -DLLVM_DIRECTORY:STRING=${LLVM_DIRECTORY}
 endif
@@ -238,7 +234,6 @@ help:
 	@echo "  make VERBOSE=1 ...          Show all compilation commands"
 	@echo "  make MYCC=xx MYCXX=yy ...   Use custom compilers"
 	@echo "  make OSL_SITE=xx            Use custom site build mods"
-	@echo "  make USE_TBB=0 ...          Don't use TBB"
 	@echo "  make LLVM_VERSION=2.9 ...   Specify which LLVM version to use"
 	@echo "  make LLVM_DIRECTORY=xx ...  Specify where LLVM lives"
 	@echo "  make LLVM_NAMESPACE=xx ...  Specify custom LLVM namespace"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -124,7 +124,6 @@ endif ()
 set (VERBOSE OFF CACHE BOOL "Print lots of messages while compiling")
 set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")
 set (HIDE_SYMBOLS OFF CACHE BOOL "Hide symbols not in the public API")
-set (USE_TBB ON CACHE BOOL "Use TBB if needed")
 if (WIN32)
     set (USE_BOOST_WAVE ON CACHE BOOL "Use Boost Wave as preprocessor")
     set (USE_LLVM_BITCODE OFF CACHE BOOL "Generate embedded LLVM bitcode")
@@ -155,7 +154,7 @@ include (flexbison)
 include_directories (
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_BINARY_DIR}/include
-      ${OPENIMAGEIO_INCLUDES} ${TBB_INCLUDES}
+      ${OPENIMAGEIO_INCLUDES}
   )
 
 

diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
@@ -103,53 +103,6 @@ link_directories ("${Boost_LIBRARY_DIRS}")
 ###########################################################################
 
 
-###########################################################################
-# TBB (Intel Thread Building Blocks) setup
-
-setup_path (TBB_HOME "${THIRD_PARTY_TOOLS_HOME}"
-            "Location of the TBB library install")
-mark_as_advanced (TBB_HOME)
-if (USE_TBB)
-    set (TBB_VERSION 22_004oss)
-    if (MSVC)
-        find_library (TBB_LIBRARY
-                      NAMES tbb
-                      PATHS ${TBB_HOME}/lib
-                      PATHS ${THIRD_PARTY_TOOLS_HOME}/lib/
-                      ${TBB_HOME}/tbb-${TBB_VERSION}/lib/
-                     )
-        find_library (TBB_DEBUG_LIBRARY
-                      NAMES tbb_debug
-                      PATHS ${TBB_HOME}/lib
-                      PATHS ${THIRD_PARTY_TOOLS_HOME}/lib/
-                      ${TBB_HOME}/tbb-${TBB_VERSION}/lib/)
-    endif (MSVC)
-    find_path (TBB_INCLUDES tbb/tbb_stddef.h
-               ${TBB_HOME}/include/tbb${TBB_VERSION}
-               ${THIRD_PARTY_TOOLS}/include/tbb${TBB_VERSION}
-               ${PROJECT_SOURCE_DIR}/include
-               ${OPENIMAGEIOHOME}/include/OpenImageIO
-              )
-    if (TBB_INCLUDES OR TBB_LIBRARY)
-        set (TBB_FOUND TRUE)
-        add_definitions ("-DUSE_TBB=1")
-        if (VERBOSE)
-            message (STATUS "TBB includes = ${TBB_INCLUDES}")
-            message (STATUS "TBB library = ${TBB_LIBRARY}")
-        endif ()
-    else ()
-        message (STATUS "TBB not found")
-    endif ()
-else ()
-    add_definitions ("-DUSE_TBB=0")
-    message (STATUS "TBB will not be used")
-    set(TBB_INCLUDES "")
-    set(TBB_LIBRARY "")
-endif ()
-
-# end TBB setup
-###########################################################################
-
 ###########################################################################
 # Partio
 

diff --git a/src/doc/languagespec.tex b/src/doc/languagespec.tex
@@ -388,8 +388,6 @@ \section*{Acknowledgments}
 {\cf http://openimageio.org}
 \item Ilmbase \copyright\ 2006, Industrial Light \& Magic.
 {\cf http://www.openexr.com}
-\item Thread Building Blocks (TBB), \copyright\ 2005--2008 Intel Corporation.\\
-{\cf http://www.threadingbuildingblocks.org/}
 \item Boost \copyright\ various authors.  {\cf http://www.boost.org}
 \item LLVM \copyright\ 2003-2010 University of Illinois at
   Urbana-Champaign. {\cf http://llvm.org}

diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
@@ -93,7 +93,7 @@ MACRO ( LLVM_COMPILE llvm_src srclist )
       -I${CMAKE_SOURCE_DIR}/include
       -I${CMAKE_BINARY_DIR}/include
       -I${OPENIMAGEIO_INCLUDES} -I${ILMBASE_INCLUDE_DIR}
-      -I${Boost_INCLUDE_DIRS} -I${TBB_INCLUDES} -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
+      -I${Boost_INCLUDE_DIRS} -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
 
       COMMAND ${LLVM_DIRECTORY}/bin/llvm-as -f -o ${llvm_bc} ${llvm_asm}
       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash ${llvm_bc} ${llvm_bc_cpp}