From 9b7c900b0ad04a16c49bcc4450dd46b0a963cc03 Mon Sep 17 00:00:00 2001 From: Rene Milk <rene.milk@uni-muenster.de> Date: Wed, 11 Feb 2015 13:59:02 +0100 Subject: [PATCH] [cmake] fixes errors with optional TBB missing --- cmake/modules/DuneUtils.cmake | 2 +- dune/stuff/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/modules/DuneUtils.cmake b/cmake/modules/DuneUtils.cmake index d2c6107b2..0d30865ef 100644 --- a/cmake/modules/DuneUtils.cmake +++ b/cmake/modules/DuneUtils.cmake @@ -137,7 +137,7 @@ macro(END_TESTCASES) add_dune_alugrid_flags(${test}) add_dune_superlu_flags(${test}) endif(dune-grid_FOUND) - if(COMMAND add_dune_tbb_flags) + if(COMMAND add_dune_tbb_flags AND TBB_FOUND) add_dune_tbb_flags(${test}) endif() endforeach( test ${testnames} ) diff --git a/dune/stuff/CMakeLists.txt b/dune/stuff/CMakeLists.txt index a99cb4a6a..bd862f542 100644 --- a/dune/stuff/CMakeLists.txt +++ b/dune/stuff/CMakeLists.txt @@ -24,7 +24,9 @@ set(lib_dune_stuff_sources common/filesystem.cc dune_add_library("dunestuff" ${lib_dune_stuff_sources} ADD_LIBS ${DUNE_LIBS}) add_dune_mpi_flags(dunestuff) -add_dune_tbb_flags(dunestuff) +if(TBB_FOUND) + add_dune_tbb_flags(dunestuff) +endif(TBB_FOUND) if(dune-grid_FOUND) add_dune_superlu_flags(dunestuff) -- GitLab