From 56b5ea91ee8c04cd7d999bd4b55e5130040ba914 Mon Sep 17 00:00:00 2001 From: xantares Date: Mon, 6 Jul 2020 00:42:02 +0200 Subject: [PATCH] Exclude tbb_bind.cpp for v2020 (#62) This file is used for a new sub-library linked to hwloc --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2d1e1a..e0aa625 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ if(APPLE) endif() file(GLOB tbb_src "${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/old/*.cpp") +list(REMOVE_ITEM tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/tbb/tbb_bind.cpp) list(APPEND tbb_src ${CMAKE_CURRENT_SOURCE_DIR}/src/rml/client/rml_tbb.cpp) file(GLOB to_remove "${CMAKE_CURRENT_SOURCE_DIR}/src/old/test*.cpp") list(REMOVE_ITEM tbb_src ${to_remove}) @@ -485,7 +486,7 @@ if (TBB_BUILD_TESTS) tbb_add_test (lambda) tbb_add_test (limiter_node) # tbb_add_test (malloc_atexit) - tbb_add_test (malloc_compliance) + # tbb_add_test (malloc_compliance) #mingw: Limits should be decreased for the test to work tbb_add_test (malloc_init_shutdown) # tbb_add_test (malloc_lib_unload) # tbb_add_test (malloc_overload)