From 36330f0c6440c2ed2e1c46dca54557ef8f093176 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Wed, 28 Nov 2018 14:32:46 -0500
Subject: [PATCH] corrected pipline errors

---
 .gitlab-ci.yml     |  2 +-
 src/CMakeLists.txt | 87 +++++++++++++++++++++++-----------------------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11d902f..cda6899 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ before_script:
   - duneci-install-module https://gitlab.dune-project.org/core/dune-common.git
   - duneci-install-module https://gitlab.dune-project.org/core/dune-geometry.git
   - duneci-install-module https://gitlab.dune-project.org/core/dune-grid.git
-  - duneci-install-module https://gitlab.dune-project.org/staging/dune-function.git
+  - duneci-install-module https://gitlab.dune-project.org/staging/dune-functions.git
   - duneci-install-module https://gitlab.dune-project.org/extensions/dune-alugrid.git
 
 debian:10 gcc-8-noassert-17:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f979b0..a67b834 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,3 @@
-add_executable("testiterator" testiterator.cc)
-target_link_dune_default_libraries("testiterator")
-if (HAVE_ALBERTA)
-  add_dune_alberta_flags(GRIDDIM 3 WORLDDIM 3 "testiterator")
-endif (HAVE_ALBERTA)
 
 add_executable("localrefinement" localrefinement.cc)
 target_link_dune_default_libraries("localrefinement")
@@ -10,6 +5,21 @@ target_link_dune_default_libraries("localrefinement")
 add_executable("uggrid" uggrid.cc)
 target_link_dune_default_libraries("uggrid")
 
+add_executable("profiling" profiling.cc)
+target_link_dune_default_libraries("profiling")
+
+add_executable("benchmark" benchmark.cc)
+target_link_dune_default_libraries("benchmark")
+
+add_executable("testiterator" testiterator.cc)
+target_link_dune_default_libraries("testiterator")
+
+if (HAVE_ALBERTA)
+  add_dune_alberta_flags(GRIDDIM 3 WORLDDIM 3 "testiterator")
+  add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 "benchmark")
+endif (HAVE_ALBERTA)
+
+
 if (DUNE_HAVE_CXX_VARIANT)
   add_executable("multigridview" multigridview.cc)
   target_link_dune_default_libraries("multigridview")
@@ -19,49 +29,38 @@ if (DUNE_HAVE_CXX_VARIANT)
 endif (DUNE_HAVE_CXX_VARIANT)
 
 
-add_executable("interpolate" interpolate.cc)
-target_link_dune_default_libraries("interpolate")
-add_executable("taylorhood" taylorhood.cc)
-target_link_dune_default_libraries("taylorhood")
-if (HAVE_ALBERTA)
-  add_dune_alberta_flags("interpolate")
-  add_dune_alberta_flags("taylorhood")
-endif ()
+if (dune-functions_FOUND AND dune-alugrid_FOUND AND HAVE_ALBERTA)
+  add_executable("interpolate" interpolate.cc)
+  target_link_dune_default_libraries("interpolate")
+  add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 "interpolate")
 
+  add_executable("taylorhood" taylorhood.cc)
+  target_link_dune_default_libraries("taylorhood")
+  add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 "taylorhood")
 
-add_executable("benchmark" benchmark.cc)
-target_link_dune_default_libraries("benchmark")
-if (HAVE_ALBERTA)
-  add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 "benchmark")
-endif ()
+  find_package(MTL QUIET PATHS /opt/development/mtl4)
+  if (MTL_FOUND)
+    set(CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
+    set(MTL_COMPILE_DEFINITIONS "")
+    foreach(feature ${CXX_ELEVEN_FEATURE_LIST})
+      list(APPEND MTL_COMPILE_DEFINITIONS "MTL_WITH_${feature}")
+    endforeach()
 
-add_executable("profiling" profiling.cc)
-target_link_dune_default_libraries("profiling")
+    if (HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
+      list(APPEND MTL_COMPILE_DEFINITIONS "MTL_HAS_UMFPACK")
+    endif ()
 
-find_package(MTL PATHS /opt/development/mtl4)
-if (MTL_FOUND)
-  set(CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
-  set(MTL_COMPILE_DEFINITIONS "")
-  foreach(feature ${CXX_ELEVEN_FEATURE_LIST})
-    list(APPEND MTL_COMPILE_DEFINITIONS "MTL_WITH_${feature}")
-  endforeach()
+    set(MTL_TARGETS "")
+    list(APPEND MTL_TARGETS "phasefield" "phasefield2" "phasefield3" "phasefield4")
 
-  if (HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
-    list(APPEND MTL_COMPILE_DEFINITIONS "MTL_HAS_UMFPACK")
-  endif ()
-
-  set(MTL_TARGETS "")
-  list(APPEND MTL_TARGETS "phasefield" "phasefield2" "phasefield3" "phasefield4")
-
-  foreach(target ${MTL_TARGETS})
-    add_executable(${target} ${target}.cc)
-    target_link_dune_default_libraries(${target})
-    if (HAVE_ALBERTA)
-      add_dune_alberta_flags(${target})
-    endif (HAVE_ALBERTA)
-    target_include_directories(${target} PRIVATE ${MTL_INCLUDE_DIRS})
-    target_compile_definitions(${target} PRIVATE ${MTL_COMPILE_DEFINITIONS})
-    target_compile_options(${target} PRIVATE -Wno-deprecated-declarations)
-  endforeach()
+    foreach(target ${MTL_TARGETS})
+      add_executable(${target} ${target}.cc)
+      target_link_dune_default_libraries(${target})
+      add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 ${target})
+      target_include_directories(${target} PRIVATE ${MTL_INCLUDE_DIRS})
+      target_compile_definitions(${target} PRIVATE ${MTL_COMPILE_DEFINITIONS})
+      target_compile_options(${target} PRIVATE -Wno-deprecated-declarations)
+    endforeach()
 
+  endif ()
 endif ()
\ No newline at end of file
-- 
2.24.1