Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
dorie
dorie
Commits
6f592ea9
Commit
6f592ea9
authored
Mar 28, 2017
by
Lukas Riedel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed libdoriesim. library is only built locally. executables are now not 'excluded from all'
parent
92b63216
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
6 deletions
+8
-6
.gitlab-ci.yml
.gitlab-ci.yml
+2
-0
CMakeLists.txt
CMakeLists.txt
+3
-0
dune/dorie-rfg/CMakeLists.txt
dune/dorie-rfg/CMakeLists.txt
+1
-1
dune/dorie/CMakeLists.txt
dune/dorie/CMakeLists.txt
+1
-1
dune/dorie/impl/CMakeLists.txt
dune/dorie/impl/CMakeLists.txt
+1
-1
lib/CMakeLists.txt
lib/CMakeLists.txt
+0
-3
No files found.
.gitlab-ci.yml
View file @
6f592ea9
...
...
@@ -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
...
...
CMakeLists.txt
View file @
6f592ea9
...
...
@@ -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"
)
...
...
dune/dorie-rfg/CMakeLists.txt
View file @
6f592ea9
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
dune/dorie/CMakeLists.txt
View file @
6f592ea9
...
...
@@ -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/dorie/impl/CMakeLists.txt
View file @
6f592ea9
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
...
...
lib/CMakeLists.txt
View file @
6f592ea9
dune_add_library
(
doriesim
_DUNE_TARGET_OBJECTS:simulations_
ADD_LIBS
${
DUNE_LIBS
}
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment