Skip to content
Snippets Groups Projects
Commit b2ae0461 authored by Andreas Dedner's avatar Andreas Dedner
Browse files

Merge branch 'cherry-pick-d5ab5050' into 'releases/2.6'

Merge branch 'duneproject-cmake-3.1' into 'master'

See merge request core/dune-common!431
parents a00c0612 2f6edf9e
No related branches found
No related tags found
3 merge requests!586Centralize CI config for 2.6 release,!531Update CI for 2.6 release branch,!431Merge branch 'duneproject-cmake-3.1' into 'master'
Pipeline #
......@@ -384,7 +384,9 @@ R_DELIM
################## CMakeLists.txt ##################
echo "- $PROJECT/CMakeLists.txt"
cat> "$PROJECT/CMakeLists.txt" << M_DELIM
cmake_minimum_required(VERSION 2.8.12)
# 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)
project($PROJECT CXX)
if(NOT (dune-common_DIR OR dune-common_ROOT OR
......
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