Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
arbor-sim
arbor
Commits
dc47325f
Commit
dc47325f
authored
8 years ago
by
Sam Yates
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'bcumming/feature/spike_handling' into feature/spike_handling
parents
c6d7f377
54b3757a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
miniapp/CMakeLists.txt
+1
-1
1 addition, 1 deletion
miniapp/CMakeLists.txt
src/CMakeLists.txt
+3
-0
3 additions, 0 deletions
src/CMakeLists.txt
src/communication/mpi.cpp
+0
-0
0 additions, 0 deletions
src/communication/mpi.cpp
with
4 additions
and
1 deletion
miniapp/CMakeLists.txt
+
1
−
1
View file @
dc47325f
set
(
HEADERS
)
set
(
MINIAPP_SOURCES
mpi.cpp
#
mpi.cpp
io.cpp
miniapp.cpp
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
3
−
0
View file @
dc47325f
...
...
@@ -7,6 +7,9 @@ set(BASE_SOURCES
parameter_list.cpp
swcio.cpp
)
if
(
${
WITH_MPI
}
)
set
(
BASE_SOURCES
${
BASE_SOURCES
}
communication/mpi.cpp
)
endif
()
add_library
(
cellalgo
${
BASE_SOURCES
}
${
HEADERS
}
)
add_dependencies
(
cellalgo build_all_mods
)
...
...
This diff is collapsed.
Click to expand it.
miniapp
/mpi.cpp
→
src/communication
/mpi.cpp
+
0
−
0
View file @
dc47325f
File moved
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment