From ea55155c9299644eddb081b2cc8055dfbdcea293 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 14 Mar 2013 00:01:54 +0000 Subject: [PATCH] And disable threading support for Cygwin git-svn-id: https://svn.dealii.org/trunk@28894 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 2035f528bb..12fc4d24bc 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -1,6 +1,6 @@ ##### ## -## Copyright (C) 2012 by the deal.II authors +## Copyright (C) 2012, 2013 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -66,11 +66,16 @@ ENDIF() # # Threading Building Blocks library # -SET(FEATURE_THREADS_HAVE_BUNDLED TRUE) -OPTION(DEAL_II_FORCE_BUNDLED_THREADS - "Always use the bundled tbb library instead of an external one." - OFF) -SET(TBB_FOLDER "${CMAKE_SOURCE_DIR}/bundled/tbb30_104oss") +IF(NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN") + # + # Cygwin is currently unsupported by tbb + # + SET(FEATURE_THREADS_HAVE_BUNDLED TRUE) + OPTION(DEAL_II_FORCE_BUNDLED_THREADS + "Always use the bundled tbb library instead of an external one." + OFF) + SET(TBB_FOLDER "${CMAKE_SOURCE_DIR}/bundled/tbb30_104oss") +ENDIF() IF(FEATURE_THREADS_BUNDLED_CONFIGURED) INSTALL(DIRECTORY ${TBB_FOLDER}/include/tbb -- 2.39.5