Skip to content
Snippets Groups Projects
Commit 22dc9e60 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Cleanup the repository after 2.9 changes

parent 259650c9
No related branches found
No related tags found
No related merge requests found
# We require version CMake version 3.1 to prevent issues
# with dune_enable_all_packages and older CMake versions.
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.13)
project(dune-scalarbasis CXX)
if(NOT (dune-common_DIR OR dune-common_ROOT OR
......@@ -20,12 +18,9 @@ include(DuneMacros)
# start a dune project with information from dune.module
dune_project()
dune_enable_all_packages()
add_subdirectory(src)
add_subdirectory(dune)
add_subdirectory(doc)
add_subdirectory(cmake/modules)
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
......@@ -4,7 +4,7 @@ Preparing the Sources
Additional to the software mentioned in README you'll need the
following programs installed on your system:
cmake >= 2.8.12
cmake >= 3.13
Getting started
---------------
......@@ -31,9 +31,9 @@ An example options file might look like this:
#use this options to configure and make if no other options are given
CMAKE_FLAGS=" \
-DCMAKE_CXX_COMPILER=g++-5 \
-DCMAKE_CXX_COMPILER=g++-7 \
-DCMAKE_CXX_FLAGS='-Wall -pedantic' \
-DCMAKE_INSTALL_PREFIX=/install/path" #Force g++-5 and set compiler flags
-DCMAKE_INSTALL_PREFIX=/install/path" #Force g++-7 and set compiler flags
If you save this information into example.opts you can pass the opts file to
dunecontrol via the --opts option, e. g.
......
set(modules "DuneScalarbasisMacros.cmake")
install(FILES ${modules} DESTINATION ${DUNE_INSTALL_MODULEDIR})
# File for module specific CMake tests.
......@@ -4,7 +4,7 @@
#Name of the module
Module: dune-scalarbasis
Version: 0.1
Version: 2.9-git
Maintainer: simon.praetorius@tu-dresden.de
#depending on
Depends: dune-functions
Depends: dune-functions (>= 2.9)
......@@ -79,6 +79,7 @@ public:
}
/// \brief Return number of possible values for next position in multi index
template<class SizePrefix>
size_type size(const SizePrefix prefix) const
{
assert(prefix.size() == 0 || prefix.size() == 1);
......
......@@ -5,7 +5,6 @@
#include <array>
#include <vector>
#include <dune/common/function.hh>
#include <dune/common/indices.hh>
#include <dune/geometry/quadraturerules.hh>
......
......@@ -5,7 +5,6 @@
#include <array>
#include <vector>
#include <dune/common/function.hh>
#include <dune/common/indices.hh>
#include <dune/geometry/quadraturerules.hh>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment