Stop linking against tbbmalloc.

This fixes a crash where newer TBB and newer OpenAL interact badly
and somehow end up crashing. CasparCG doesn't have much of a need
of tbbmalloc anyway.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c1fd9097631d339cbf0491bf340fbe9959167fe..024e4fb8e435804eaeeb9550ececac58a52a8bca 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ else()
        if(MSVC)
                set(TBB_LIBRARIES optimized tbb debug tbb_debug)
        else()
-               set(TBB_LIBRARIES tbb tbbmalloc tbbmalloc_proxy)
+               set(TBB_LIBRARIES tbb)
        endif()
        set(TBB_BIN_DIR                         "${DEPENDENCIES_FOLDER}/tbb/bin/${PLATFORM_FOLDER_NAME}")
        link_directories("${DEPENDENCIES_FOLDER}/tbb/lib/${PLATFORM_FOLDER_NAME}")

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ae144c7026d6acc8bac975706a4cd7cf1dcd9956..38668898079473c9b35be5c2f44fcf43c758cfd2 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -109,7 +109,7 @@ source_group(sources\\os os/*)
 
 target_link_libraries(common
        "${ASMLIB_LIBRARIES}"
-       "${TBB_LIBRARIES}"
+       tbb
        "${GLEW_LIBRARIES}"
        "${OPENGL_gl_LIBRARY}"
        "${FREETYPE_LIBRARIES}"
@@ -151,7 +151,5 @@ if(NOT USE_SYSTEM_TBB)
        else()
                casparcg_add_runtime_dependency("${GLEW_BIN_DIR}/libGLEW.so.1.12")
                casparcg_add_runtime_dependency("${TBB_BIN_DIR}/libtbb.so.2")
-               casparcg_add_runtime_dependency("${TBB_BIN_DIR}/libtbbmalloc_proxy.so.2")
-               casparcg_add_runtime_dependency("${TBB_BIN_DIR}/libtbbmalloc.so.2")
        endif()
 endif()