From bc56a399ca097131469f219cf2cb81d13b91d5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 22 Jan 2016 17:07:35 +0100
Subject: [PATCH] [CMake] Beautifications; bump required CMake version to
2.8.12
---
CMakeLists.txt | 12 ++++++------
cmake/modules/DuneIstlMacros.cmake | 4 +---
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5662bf71b..1b9d91146 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
# set up project
-project("dune-istl" C CXX)
+project(dune-istl C CXX)
# general stuff
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.12)
# guess build tree of dune-common
if(NOT (dune-common_DIR OR dune-common_ROOT OR
@@ -23,10 +23,10 @@ include(DuneMacros)
# start a dune project with information from dune.module
dune_project()
-add_subdirectory("cmake/modules")
-add_subdirectory("m4")
-add_subdirectory("dune")
-add_subdirectory("doc")
+add_subdirectory(cmake/modules)
+add_subdirectory(m4)
+add_subdirectory(dune)
+add_subdirectory(doc)
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
diff --git a/cmake/modules/DuneIstlMacros.cmake b/cmake/modules/DuneIstlMacros.cmake
index 25777996f..1e61bc662 100644
--- a/cmake/modules/DuneIstlMacros.cmake
+++ b/cmake/modules/DuneIstlMacros.cmake
@@ -8,9 +8,7 @@ find_package(ParMETIS)
include(AddParMETISFlags)
find_package(SuperLU)
include(AddSuperLUFlags)
-find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK)
-include(AddSuiteSparseFlags)
find_package(ARPACKPP)
include(AddARPACKPPFlags)
-find_package(SuiteSparse OPTIONAL_COMPONENTS LDL SPQR)
+find_package(SuiteSparse OPTIONAL_COMPONENTS LDL SPQR UMFPACK)
include(AddSuiteSparseFlags)
--
GitLab