Commit 8634c970 authored by Lukas Riedel's avatar Lukas Riedel

Merge branch 'fix-errors-from-mr-98' into 94-base-class-for-simulations

parents f96c5ab1 e05eb529
...@@ -21,7 +21,7 @@ add_custom_target(system_tests ...@@ -21,7 +21,7 @@ add_custom_target(system_tests
function(add_coverage_links) function(add_coverage_links)
foreach(target ${ARGV}) foreach(target ${ARGV})
target_compile_options(${target} PRIVATE --coverage) target_compile_options(${target} PRIVATE --coverage)
target_link_libraries(${target} PRIVATE --coverage) target_link_libraries(${target} --coverage)
endforeach() endforeach()
endfunction() endfunction()
...@@ -55,6 +55,7 @@ function(dorie_add_unit_test) ...@@ -55,6 +55,7 @@ function(dorie_add_unit_test)
# use name prefix for test # use name prefix for test
if(NOT UNIT_TEST_NAME) if(NOT UNIT_TEST_NAME)
message(SEND_ERROR "No unit test name specified!") message(SEND_ERROR "No unit test name specified!")
endif()
string(PREPEND UNIT_TEST_NAME ut-) string(PREPEND UNIT_TEST_NAME ut-)
# forward to dune function # forward to dune function
......
...@@ -12,7 +12,7 @@ ADD . /opt/dune/dorie/ ...@@ -12,7 +12,7 @@ ADD . /opt/dune/dorie/
RUN CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" \ RUN CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" \
./dune-common/bin/dunecontrol --only=dorie configure \ ./dune-common/bin/dunecontrol --only=dorie configure \
&& MAKE_FLAGS="-j ${PROCNUM}" \ && MAKE_FLAGS="-j ${PROCNUM}" \
./dune-common/bin/dunecontrol --only=dorie make dorie-rfg dorie ./dune-common/bin/dunecontrol --only=dorie make dorie-rfg dorie \
&& ./dune-common/bin/dunecontrol --only=dorie exec \ && ./dune-common/bin/dunecontrol --only=dorie exec \
"rm build-cmake/dune/dorie/impl/libdorie-impl.a build-cmake/dune/dorie/impl/CMakeFiles/dorie-impl.dir/*.cc.o" "rm build-cmake/dune/dorie/impl/libdorie-impl.a build-cmake/dune/dorie/impl/CMakeFiles/dorie-impl.dir/*.cc.o"
ENV PATH="/opt/dune/dorie/build-cmake/bin:${PATH}" ENV PATH="/opt/dune/dorie/build-cmake/bin:${PATH}"
......
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