From: Matthias Maier Date: Mon, 25 May 2020 17:20:25 +0000 (-0500) Subject: fix rename leftovers X-Git-Tag: v9.3.0-rc1~1546^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c095a034539c9fc5fb95fee2af6cb3cb68e55bb;p=dealii.git fix rename leftovers --- diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt index ae7ea16927..470732069b 100644 --- a/bundled/CMakeLists.txt +++ b/bundled/CMakeLists.txt @@ -37,8 +37,8 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED) ENDIF() -IF(FEATURE_TASKFLOW_BUNDLED_CONFIGURED) - INSTALL(DIRECTORY ${TASKFLOW_FOLDER}/include/taskflow +IF(FEATURE_CPP_TASKFLOW_BUNDLED_CONFIGURED) + INSTALL(DIRECTORY ${CPP_TASKFLOW_FOLDER}/include/taskflow DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled COMPONENT library ) diff --git a/bundled/setup_bundled.cmake b/bundled/setup_bundled.cmake index 0ad4f057b4..4926a0cd69 100644 --- a/bundled/setup_bundled.cmake +++ b/bundled/setup_bundled.cmake @@ -34,13 +34,13 @@ SET(BOOST_FOLDER "${CMAKE_SOURCE_DIR}/bundled/boost-1.70.0") # CPP Taskflow # -SET(FEATURE_TASKFLOW_HAVE_BUNDLED TRUE) +SET(FEATURE_CPP_TASKFLOW_HAVE_BUNDLED TRUE) -OPTION(DEAL_II_FORCE_BUNDLED_TASKFLOW +OPTION(DEAL_II_FORCE_BUNDLED_CPP_TASKFLOW "Always use the bundled taskflow header library instead of an external one." OFF) -SET(TASKFLOW_FOLDER "${CMAKE_SOURCE_DIR}/bundled/cpp-taskflow") +SET(CPP_TASKFLOW_FOLDER "${CMAKE_SOURCE_DIR}/bundled/cpp-taskflow") # diff --git a/cmake/configure/configure_1_taskflow.cmake b/cmake/configure/configure_1_cpp_taskflow.cmake similarity index 100% rename from cmake/configure/configure_1_taskflow.cmake rename to cmake/configure/configure_1_cpp_taskflow.cmake