Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
EveryBeam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
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
Container Registry
Model registry
Operate
Environments
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ResearchAndDevelopment
EveryBeam
Commits
a097e23f
Commit
a097e23f
authored
4 years ago
by
Tammo Jan Dijkema
Browse files
Options
Downloads
Plain Diff
Merge branch 'BuildWithoutTest' into 'master'
Fix building without tests Closes
#54
See merge request
!70
parents
b25e0a6a
7aa8fb51
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!70
Fix building without tests
Pipeline
#4456
failed
4 years ago
Stage: prepare
Stage: build
Stage: oskar-comparison
Changes
2
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-0
4 additions, 0 deletions
CMakeLists.txt
cpp/test/CMakeLists.txt
+1
-3
1 addition, 3 deletions
cpp/test/CMakeLists.txt
with
5 additions
and
3 deletions
CMakeLists.txt
+
4
−
0
View file @
a097e23f
...
...
@@ -111,6 +111,10 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
endif
()
endif
()
#------------------------------------------------------------------------------
# Generate config.h file
configure_file
(
${
CMAKE_SOURCE_DIR
}
/CMake/config.h.in
${
CMAKE_BINARY_DIR
}
/config.h
)
#------------------------------------------------------------------------------
# Documentation
find_package
(
Doxygen
)
...
...
This diff is collapsed.
Click to expand it.
cpp/test/CMakeLists.txt
+
1
−
3
View file @
a097e23f
...
...
@@ -8,8 +8,6 @@ set(VLA_MOCK_MS ${CMAKE_SOURCE_DIR}/test_data/VLA_MOCK.ms CACHE PATH "")
set
(
MWA_MOCK_MS
${
CMAKE_SOURCE_DIR
}
/test_data/MWA_MOCK.ms CACHE PATH
""
)
set
(
MWA_COEFF_PATH
${
CMAKE_SOURCE_DIR
}
/test_data/mwa_full_embedded_element_pattern.h5 CACHE PATH
""
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/CMake/config.h.in
${
CMAKE_BINARY_DIR
}
/config.h
)
#------------------------------------------------------------------------------
set
(
TEST_FILENAMES
runtests.cc
...
...
@@ -71,4 +69,4 @@ add_test(
set_tests_properties
(
unittests PROPERTIES LABELS unit
FIXTURES_REQUIRED
"unittests;mocks"
)
\ No newline at end of file
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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