Commit eb3e9ff1 authored by Dion Haefner's avatar Dion Haefner

Adjusted README:

  * use dunecontrol for all commands instead of fiddling with CMake in the build directory
  * some third-party version requirements seemed too strict
  * removed optional packages (METIS, parMETIS, Breathe, Sphinx)
  * removed Python VTK as suggested package. This is nearly impossible to build from source. People can use our VTK readers for post-processing (coming soon).
  * added section on cleaning build (delete build-cmake folder)
  * stressed that dunecontrol make install is optional (may not be desired by the user due to permissions / personal preference)

Added setup.py file for doc folder, so Sphinx and Breathe are installed at configure time now

Removed third-party Python packages from install_requires in setup.py files

Compiler flags are handled by CMake now. Default build type is Release, which automatically adds optimization flags, and equivalently for the Debug build type (cf. e.g. CMAKE_CXX_FLAGS_RELEASE).
parent 68db3308
cmake_minimum_required(VERSION 2.8.12)
project(dorie CXX)
# set build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER)
if(CMAKE_BUILD_TYPE_UPPER MATCHES DEBUG)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
#
if(NOT (dune-common_DIR OR dune-common_ROOT OR
"${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*"))
string(REPLACE ${CMAKE_PROJECT_NAME} dune-common dune-common_DIR
${PROJECT_BINARY_DIR})
endif()
#find dune-common and set the module path
# find dune-common and set the module path
find_package(dune-common REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules"
${dune-common_MODULE_PATH})
#include the dune macros
# include the dune macros
include(DuneMacros)
# set some variables
set(CMAKE_DISABLE_FIND_PACKAGE_Python2Interp 1)
# start a dune project with information from dune.module
dune_project()
dune_enable_all_packages()
......@@ -38,8 +47,4 @@ add_subdirectory("cmake/modules")
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
if(NOT CMAKE_BUILD_TYPE)
message(STATUS "Build Type: None")
else()
message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
endif()
\ No newline at end of file
message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
This diff is collapsed.
......@@ -6,6 +6,7 @@ endfunction()
set(python_paths "")
install_python_package("doc" python_paths)
install_python_package("utilities" python_paths)
install_python_package("parscraper" python_paths)
if(dune-testtools_FOUND)
......
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import sys
from setuptools import setup
# do nothing, just install requirements
setup(name='dorie.doc')
......@@ -15,5 +15,5 @@ setup(name='dorie.testtools',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.testtools','dorie.testtools.evaluation', 'dorie.testtools.utilities','dorie.testtools.wrapper'],
install_requires=['numpy','scipy','matplotlib','dune.testtools','dorie.utilities'],
install_requires=['dune.testtools','dorie.utilities'],
scripts=dorie_testtools_scripts())
......@@ -15,6 +15,6 @@ setup(name='dorie.utilities',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.utilities'],
install_requires=['numpy','scipy','matplotlib'],
install_requires=[],
scripts=dorie_utilities_scripts()
)
add_executable("dorie" dorie.cc)
target_link_dune_default_libraries("dorie")
target_compile_options("dorie" PRIVATE $<$<CONFIG:Debug>:-Wall>)
target_compile_options("dorie" PRIVATE $<$<NOT:$<CONFIG:Debug>>:-O3 -g0>)
\ No newline at end of file
include /opt/dune/dorie/build-cmake/doc/parameters/default.ini
include /home/dion/codes/dune/dorie/build-cmake/doc/parameters/default.ini
__inifile_optionkey = run
_asset_path = "/opt/dune/dorie/testing"
_asset_path = "/home/dion/codes/dune/dorie/testing"
_evaluation = convergence, correlation
output.fileName = convergence | unique
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment