Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
waLBerla
waLBerla
Commits
dd620011
Commit
dd620011
authored
May 18, 2021
by
Dominik Thoennes
Browse files
Merge branch 'FixCmakeConvexParticles' into 'master'
Fixed ordering of cmake commands See merge request
!454
parents
fd01f6c9
9e308c43
Pipeline
#32175
passed with stages
in 259 minutes and 14 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
dd620011
...
...
@@ -1256,6 +1256,8 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/src )
# All include paths are specified relative to src/ directory
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
)
# sources
add_subdirectory
(
src
)
# Generate file with compile options, and add install rule for it
configure_file
(
src/waLBerlaDefinitions.in.h
...
...
@@ -1263,8 +1265,6 @@ configure_file ( src/waLBerlaDefinitions.in.h
install
(
FILES
${
walberla_BINARY_DIR
}
/src/waLBerlaDefinitions.h DESTINATION walberla/
)
# sources
add_subdirectory
(
src
)
# test
if
(
WALBERLA_BUILD_TESTS
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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