From: Matthias Maier Date: Thu, 16 Jun 2022 17:17:31 +0000 (-0500) Subject: CMake: Remove taskflow configure X-Git-Tag: v9.4.0-rc1~1^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f5c5d3d49e00920a952fd1ec9da8ec7bcdc9e84;p=dealii.git CMake: Remove taskflow configure --- diff --git a/cmake/configure/configure_10_taskflow.cmake b/cmake/configure/configure_10_taskflow.cmake deleted file mode 100644 index 8d389da435..0000000000 --- a/cmake/configure/configure_10_taskflow.cmake +++ /dev/null @@ -1,79 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2021 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(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() - - -MACRO(FEATURE_TASKFLOW_CONFIGURE_BUNDLED) - LIST(APPEND TASKFLOW_BUNDLED_INCLUDE_DIRS ${TASKFLOW_FOLDER}/include) -ENDMACRO() - - -CONFIGURE_FEATURE(TASKFLOW) - diff --git a/cmake/modules/FindTASKFLOW.cmake b/cmake/modules/FindTASKFLOW.cmake deleted file mode 100644 index e118fbbabf..0000000000 --- a/cmake/modules/FindTASKFLOW.cmake +++ /dev/null @@ -1,58 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2020 - 2021 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}") - -DEAL_II_PACKAGE_HANDLE(TASKFLOW - INCLUDE_DIRS REQUIRED TASKFLOW_INCLUDE_DIR - USER_INCLUDE_DIRS REQUIRED TASKFLOW_INCLUDE_DIR - CLEAR TASKFLOW_CONFIG_DIR - )