fix rename leftovers

diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt
index ae7ea1692736da48dd57f7371cfe4afab8219c04..470732069bb845b54448229adf964c8d91d98215 100644 (file)
--- 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 0ad4f057b4093ec37fbe827156aecff591596849..4926a0cd692577011fb0cd58744f92759cbcadff 100644 (file)
--- 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