Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
EveryBeam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Peijin Zhang
EveryBeam
Compare revisions
master to test-schaapcommon
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
zhang/EveryBeam
Select target project
No results found
test-schaapcommon
Select Git revision
Loading items
Swap
Target
RD/EveryBeam
Select target project
RD/EveryBeam
zhang/EveryBeam
sweijen/EveryBeam
mancini/EveryBeam
rozendaal/every-beam-refactor
5 results
master
Select Git revision
Loading items
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (5)
Add schaapcommon
· 74197ca0
Jakob Maljaars
authored
4 years ago
74197ca0
Bump schaapcommon
· b456520d
Jakob Maljaars
authored
4 years ago
b456520d
Bump schaapcommon
· 1ada1bcd
Jakob Maljaars
authored
4 years ago
1ada1bcd
Bump schaapcommon
· 23df7354
Jakob Maljaars
authored
4 years ago
23df7354
Test if ci skipped
· e5e07cc2
Jakob Maljaars
authored
4 years ago
e5e07cc2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitmodules
+3
-0
3 additions, 0 deletions
.gitmodules
CMakeLists.txt
+13
-2
13 additions, 2 deletions
CMakeLists.txt
external/schaapcommon
+1
-0
1 addition, 0 deletions
external/schaapcommon
with
17 additions
and
2 deletions
.gitmodules
View file @
e5e07cc2
...
@@ -7,3 +7,6 @@
...
@@ -7,3 +7,6 @@
[submodule "external/pybind11"]
[submodule "external/pybind11"]
path = external/pybind11
path = external/pybind11
url = https://github.com/pybind/pybind11.git
url = https://github.com/pybind/pybind11.git
[submodule "external/schaapcommon"]
path = external/schaapcommon
url = https://git.astron.nl/RD/schaapcommon.git
This diff is collapsed.
Click to expand it.
CMakeLists.txt
View file @
e5e07cc2
...
@@ -53,7 +53,18 @@ endif()
...
@@ -53,7 +53,18 @@ endif()
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/external/aocommon/include/"
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/external/aocommon/include/"
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/external/eigen/"
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/external/eigen/"
)
add_subdirectory
(
"
${
CMAKE_SOURCE_DIR
}
/external/pybind11"
)
add_subdirectory
(
"
${
CMAKE_SOURCE_DIR
}
/external/pybind11"
)
include_directories
(
${
pybind11_INCLUDE_DIR
}
)
include_directories
(
${
PYBIND11_INCLUDE_DIR
}
)
### JUST TESTING SCHAAPCOMMON
# find_path(SCHAAPCOMMON_INCLUDE_DIR NAMES schaapcommon/hello_world.h)
# find_library(SCHAAPCOMMON_LIB schaapcommon)
# include_directories(${SCHAAPCOMMON_INCLUDE_DIR})
add_subdirectory
(
"
${
CMAKE_SOURCE_DIR
}
/external/schaapcommon"
)
# message("WHATS THIS")
# message(STATUS ${schaapcommon_INCLUDE_DIR})
# set(SCHAAPCOMMON_INCLUDE_DIR "/home/maljaars/opt/everybeam/EveryBeam/external/schaapcommon/schaapcommon")
# include_directories(${SCHAAPCOMMON_INCLUDE_DIR})
# Find and include HDF5
# Find and include HDF5
find_package
(
HDF5 COMPONENTS C CXX REQUIRED
)
find_package
(
HDF5 COMPONENTS C CXX REQUIRED
)
...
...
This diff is collapsed.
Click to expand it.
schaapcommon
@
647066c8
Subproject commit 647066c81c47f163315c6599b9679bb2dbdb813a
This diff is collapsed.
Click to expand it.