]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix rename leftovers
authorMatthias Maier <tamiko@43-1.org>
Mon, 25 May 2020 17:20:25 +0000 (12:20 -0500)
committerMatthias Maier <tamiko@43-1.org>
Wed, 27 May 2020 03:34:01 +0000 (22:34 -0500)
bundled/CMakeLists.txt
bundled/setup_bundled.cmake
cmake/configure/configure_1_cpp_taskflow.cmake [moved from cmake/configure/configure_1_taskflow.cmake with 100% similarity]

index ae7ea1692736da48dd57f7371cfe4afab8219c04..470732069bb845b54448229adf964c8d91d98215 100644 (file)
@@ -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
     )
index 0ad4f057b4093ec37fbe827156aecff591596849..4926a0cd692577011fb0cd58744f92759cbcadff 100644 (file)
@@ -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")
 
 
 #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.