From 74328596f6ed4b8a3e4a2b0feee5895e067acd3e Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Thu, 17 Sep 2020 00:18:45 +0200
Subject: [PATCH] [cmake] Smaller python improvements
---
CMakeLists.txt | 4 ++--
dune/CMakeLists.txt | 4 ++--
dune/common/parallel/CMakeLists.txt | 1 -
python/dune/common/project.py | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8172b7f0..dec2c1b9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,8 +26,8 @@ add_subdirectory("cmake/modules")
add_subdirectory("cmake/scripts")
# if Python bindings are enabled, include necessary sub directories.
-if( DUNE_ENABLE_PYTHONBINDINGS )
- add_subdirectory("python")
+if(DUNE_ENABLE_PYTHONBINDINGS)
+ add_subdirectory(python)
dune_python_install_package(PATH "python")
endif()
diff --git a/dune/CMakeLists.txt b/dune/CMakeLists.txt
index 2a0c96a2d..c1a0f1412 100644
--- a/dune/CMakeLists.txt
+++ b/dune/CMakeLists.txt
@@ -1,6 +1,6 @@
add_subdirectory("common")
# if Python bindings are enabled, include necessary sub directories.
-if( DUNE_ENABLE_PYTHONBINDINGS )
- add_subdirectory("python")
+if(DUNE_ENABLE_PYTHONBINDINGS)
+ add_subdirectory(python)
endif()
diff --git a/dune/common/parallel/CMakeLists.txt b/dune/common/parallel/CMakeLists.txt
index 6ca379e2b..1244770ac 100644
--- a/dune/common/parallel/CMakeLists.txt
+++ b/dune/common/parallel/CMakeLists.txt
@@ -24,4 +24,3 @@ install(FILES
selection.hh
variablesizecommunicator.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common/parallel)
-
diff --git a/python/dune/common/project.py b/python/dune/common/project.py
index 67ea186d9..1d5cd8868 100644
--- a/python/dune/common/project.py
+++ b/python/dune/common/project.py
@@ -65,7 +65,7 @@ def make_project(dir, description, subdirs=None, enable_all_packages=True, is_du
with open(os.path.join(dir, 'dune.module'), 'w') as file:
file.write(repr(description))
- cmake_content = ['cmake_minimum_required(VERSION 3.1)', 'project(' + description.name + ' C CXX)']
+ cmake_content = ['cmake_minimum_required(VERSION 3.13)', 'project(' + description.name + ' C CXX)']
if is_dunepy:
cmake_content += ['', 'set(DUNE_ENABLE_PYTHONBINDINGS ON)']
cmake_content += ['',
--
GitLab