Commit 358db6bc authored by jonathan.wunderlich's avatar jonathan.wunderlich
Browse files

Merge branch 'adapt-224' into 'master'

Adapt 224

See merge request !6
parents 3c69f4af 5cc217c7
Pipeline #221502 passed with stages
in 19 minutes and 42 seconds
cmake_minimum_required(VERSION 3.5.1)
project(DGwave)
include(mpp/CMakeOptionMacros.txt)
set(SPACE_DIM 3 CACHE STRING "SPACE_DIM")
set(USE_SPACETIME OFF CACHE STRING "USE_SPACETIME")
set(COMPILER_OPTIMIZE -O3 CACHE STRING "COMPILER_OPTIMIZE")
set(NO_DEPRECATED ON CACHE STRING "NO_DEPRECATED")
set(AFFINE_LINEAR_TRAFO OFF CACHE STRING "AFFINE_LINEAR_TRAFO")
set(BUILD_TESTS OFF CACHE STRING "BUILD_TESTS")
set(BUILD_DGWAVE_TESTS ON CACHE STRING "BUILD_DGWAVE_TESTS")
set(BUILD_TUTORIAL OFF CACHE STRING "BUILD_TUTORIAL")
set(BUILD_TUTORIAL_TESTS OFF CACHE STRING "BUILD_TUTORIAL_TESTS")
set_option(MPP_BUILD_TYPE MppRelease)
set_option(SPACE_DIM 3)
set_option(USE_SPACETIME OFF)
set_option(SUPPRESS_WARNINGS ON)
set_option(AFFINE_LINEAR_TRAFO OFF)
set_option(BUILD_TESTS OFF)
set_option(BUILD_DGWAVE_TESTS ON)
#---------------------------------------------------------------------------------------#
# include M++
......
......@@ -20,7 +20,7 @@ RUN cd mpp && \
cd .. && \
mkdir -p build && \
cd build && \
cmake .. -DBUILD_DGWAVE_TESTS=ON && \
cmake .. -DMPP_BUILD_TYPE=MppDebugFast -DBUILD_DGWAVE_TESTS=ON && \
make -j
# Default to a login shell
......
Subproject commit 973247ff0d2aebff932784ef91b3c6b647996975
Subproject commit 2393ee33d80b4bf7b90095fbea6be0294305673c
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