From 47fde090681f1ec4cfe973718df720417235594a Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 27 Jun 2023 16:17:19 -0500 Subject: [PATCH] CMake: disable DEAL_II_WITH_TASKFLOW --- cmake/configure/configure_10_taskflow.cmake | 74 --------------------- cmake/modules/FindDEAL_II_TASKFLOW.cmake | 57 ---------------- 2 files changed, 131 deletions(-) delete mode 100644 cmake/configure/configure_10_taskflow.cmake delete mode 100644 cmake/modules/FindDEAL_II_TASKFLOW.cmake diff --git a/cmake/configure/configure_10_taskflow.cmake b/cmake/configure/configure_10_taskflow.cmake deleted file mode 100644 index 1e6e78cac1..0000000000 --- a/cmake/configure/configure_10_taskflow.cmake +++ /dev/null @@ -1,74 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2022 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE.md at -## the top level directory of deal.II. -## -## --------------------------------------------------------------------- - -# -# Configuration for thread support in deal.II with the help of the Taskflow -# library: -# - -# -# Disallow the default detection of taskflow for the time being to avoid -# unpleasant surprises on user side. -# -set(DEAL_II_WITH_TASKFLOW OFF CACHE BOOL "") - -macro(feature_taskflow_find_external var) - find_package(DEAL_II_TASKFLOW) - - if(TASKFLOW_FOUND) - set(${var} TRUE) - endif() - - if(TASKFLOW_VERSION VERSION_LESS "2.4") - # Clear the previously determined version numbers to avoid confusion - set(TASKFLOW_VERSION "bundled") - set(TASKFLOW_VERSION_MAJOR "") - set(TASKFLOW_VERSION_MINOR "") - - message(STATUS - "The externally provided Taskflow library is older than version 2.4, " - "which cannot be used with deal.II." - ) - set(TASKFLOW_ADDITIONAL_ERROR_STRING - "The externally provided Taskflow library is older than version\n" - "2.4, which is the oldest version compatible with deal.II." - ) - set(${var} FALSE) - endif() - - - if(NOT TASKFLOW_VERSION VERSION_LESS "3.0" AND NOT DEAL_II_HAVE_CXX17) - # Clear the previously determined version numbers to avoid confusion - set(TASKFLOW_VERSION "bundled") - set(TASKFLOW_VERSION_MAJOR "") - set(TASKFLOW_VERSION_MINOR "") - - message(STATUS - "The externally provided Taskflow library (version 3.0 onwards) - requires C++17 support, which has not been configured." - ) - set(TASKFLOW_ADDITIONAL_ERROR_STRING - "The externally provided Taskflow library (version 3.0 onwards) " - "requires C++17 support, but no C++17 support had been detected " - "during configuration.\n" - "Try to set -DDEAL_II_CXX_FLAGS=\"-std=c++17\" by hand.\n" - ) - set(${var} FALSE) - endif() -endmacro() - - -configure_feature(TASKFLOW) - diff --git a/cmake/modules/FindDEAL_II_TASKFLOW.cmake b/cmake/modules/FindDEAL_II_TASKFLOW.cmake deleted file mode 100644 index 88ceaf2298..0000000000 --- a/cmake/modules/FindDEAL_II_TASKFLOW.cmake +++ /dev/null @@ -1,57 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2020 - 2022 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE.md at -## the top level directory of deal.II. -## -## --------------------------------------------------------------------- - -# -# Try to find the Taskflow library -# -# This module exports -# -# TASKFLOW_INCLUDE_DIRS -# TASKFLOW_VERSION -# - -set(TASKFLOW_DIR "" CACHE PATH "An optional hint to a Taskflow installation") -set_if_empty(TASKFLOW_DIR "$ENV{TASKFLOW_DIR}") - -find_package(TASKFLOW_CONFIG - CONFIG QUIET - NAMES Taskflow - HINTS - ${TASKFLOW_DIR}/lib/cmake/Taskflow - ${TASKFLOW_DIR} - PATH_SUFFIXES - lib64/cmake/Taskflow - lib/cmake/Taskflow - lib${LIB_SUFFIX}/cmake/Taskflow - NO_SYSTEM_ENVIRONMENT_PATH - ) - -set(TASKFLOW_INCLUDE_DIR ${Taskflow_INCLUDE_DIR}) - -# -# Extract version numbers: -# -set(TASKFLOW_VERSION "${TASKFLOW_CONFIG_VERSION}") -string(REGEX REPLACE - "^([0-9]+).*$" "\\1" - TASKFLOW_VERSION_MAJOR "${TASKFLOW_CONFIG_VERSION}") -string(REGEX REPLACE - "^[0-9]+\\.([0-9]+).*$" "\\1" - TASKFLOW_VERSION_MINOR "${TASKFLOW_CONFIG_VERSION}") - -process_feature(TASKFLOW - INCLUDE_DIRS REQUIRED TASKFLOW_INCLUDE_DIR - CLEAR TASKFLOW_CONFIG_DIR - ) -- 2.39.5