Commit 6f592ea9 authored by Lukas Riedel's avatar Lukas Riedel

removed libdoriesim. library is only built locally. executables are now not 'excluded from all'

parent 92b63216
......@@ -6,8 +6,10 @@ variables:
before_script:
- cd /opt/dune
- git clone https://gitlab.dune-project.org/staging/dune-functions.git
- git clone https://gitlab.dune-project.org/staging/dune-uggrid.git
- ./dune-common/bin/dunecontrol update || true
- ./dune-common/bin/dunecontrol --only=dune-common git checkout releases/2.5
- ./dune-common/bin/dunecontrol --only=dune-uggrid git checkout releases/2.5
- ./dune-common/bin/dunecontrol --only=dune-istl git checkout releases/2.5
- ./dune-common/bin/dunecontrol --only=dune-grid git checkout releases/2.5
- ./dune-common/bin/dunecontrol --only=dune-functions git checkout releases/2.5
......
......@@ -32,6 +32,9 @@ dune_project()
dune_enable_all_packages()
dune_require_cxx_standard(MODULE "dorie" VERSION 14)
# avoid the executables from being 'excluded from all'
set(DUNE_BUILD_TESTS_ON_MAKE_ALL TRUE)
# add subdirectories
add_subdirectory("bin")
add_subdirectory("m4")
......
add_executable("dorie-rfg" dorie-rfg.cc)
target_link_dune_default_libraries("dorie-rfg")
\ No newline at end of file
dune_target_link_libraries(dorie-rfg ${DUNE_LIBS})
\ No newline at end of file
......@@ -3,4 +3,4 @@ add_subdirectory(solver)
add_subdirectory(impl)
add_executable("dorie" dorie.cc)
dune_target_link_libraries(dorie doriesim)
\ No newline at end of file
dune_target_link_libraries(dorie dorie-impl ${DUNE_LIBS})
\ No newline at end of file
dune_add_library(simulations OBJECT
add_library(dorie-impl STATIC
sim_ug_2_1.cc
sim_ug_2_2.cc
sim_ug_2_3.cc
......
dune_add_library(doriesim
_DUNE_TARGET_OBJECTS:simulations_
ADD_LIBS ${DUNE_LIBS})
\ No newline at end of file
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