From 9c3eeffe2cb43465884f2e97a93f227d5ddb9ad5 Mon Sep 17 00:00:00 2001 From: Transporter Date: Thu, 16 Jul 2020 19:14:48 +0200 Subject: [PATCH] Bugfix TBB linking #5782 The query if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug) only works if you call CMake explicitly with the build configuration Debug. But if you generate Debug and Release all libraries are linked to the release version. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b1aaf3ab..0aaf06c2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -530,8 +530,8 @@ else() find_package(TBB REQUIRED) add_dependency_includes(${TBB_INCLUDE_DIR}) - if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug) - set(TBB_LIBRARIES ${TBB_DEBUG_LIBRARIES}) + if(WIN32) + set(TBB_LIBRARIES optimized ${TBB_LIBRARY} optimized ${TBB_MALLOC_LIBRARY} debug ${TBB_LIBRARY_DEBUG} debug ${TBB_MALLOC_LIBRARY_DEBUG}) endif() find_package(EXPAT REQUIRED)