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
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ResearchAndDevelopment
EveryBeam
Commits
56e81b23
Commit
56e81b23
authored
1 month ago
by
Maik Nijhuis
Browse files
Options
Downloads
Patches
Plain Diff
Remove dependency on C compiler
parent
b28377ed
No related branches found
No related tags found
1 merge request
!410
Remove dependency on C compiler
Pipeline
#123487
failed
2 days ago
Stage: prepare
Stage: build
Stage: package
Stage: test
Stage: deploy
Changes
4
Pipelines
6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMake/FindCasacore.cmake
+7
-1
7 additions, 1 deletion
CMake/FindCasacore.cmake
CMakeLists.txt
+5
-2
5 additions, 2 deletions
CMakeLists.txt
external/aocommon
+1
-1
1 addition, 1 deletion
external/aocommon
external/schaapcommon
+1
-1
1 addition, 1 deletion
external/schaapcommon
with
14 additions
and
5 deletions
CMake/FindCasacore.cmake
+
7
−
1
View file @
56e81b23
...
...
@@ -209,7 +209,13 @@ else(NOT CASACORE_INCLUDE_DIR)
foreach
(
_comp
${
_find_components
}
)
casacore_find_library
(
casa_
${
_comp
}
)
if
(
${
_comp
}
STREQUAL casa
)
casacore_find_package
(
HDF5
)
# Use 'find_package' directly for HDF5, since 'casacore_find_package'
# does not support the extra 'COMPONENTS CXX' arguments.
find_package
(
HDF5 COMPONENTS CXX
)
if
(
HDF5_FOUND
)
list
(
APPEND CASACORE_INCLUDE_DIRS
${
HDF5_INCLUDE_DIRS
}
)
list
(
APPEND CASACORE_LIBRARIES
${
HDF5_LIBRARIES
}
)
endif
(
HDF5_FOUND
)
casacore_find_library
(
m
)
list
(
APPEND CASACORE_LIBRARIES
${
CMAKE_DL_LIBS
}
)
elseif
(
${
_comp
}
STREQUAL coordinates
)
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
5
−
2
View file @
56e81b23
...
...
@@ -19,7 +19,10 @@ else()
FATAL_ERROR
"Failed to parse EVERYBEAM_VERSION='
${
EVERYBEAM_VERSION
}
'"
)
endif
()
project
(
EveryBeam VERSION
${
EVERYBEAM_VERSION
}
)
project
(
EveryBeam
VERSION
${
EVERYBEAM_VERSION
}
LANGUAGES CXX
)
# CMake versions less than 3.17 do not support CMAKE_MESSAGE_LOG_LEVEL
# Fake it here to silence unwanted output
...
...
@@ -189,7 +192,7 @@ include_directories("${CMAKE_SOURCE_DIR}/external/schaapcommon/include")
# Find and include HDF5
find_package
(
HDF5
COMPONENTS
C
CXX
COMPONENTS CXX
REQUIRED
)
add_definitions
(
${
HDF5_DEFINITIONS
}
-DH5_USE_110_API
)
include_directories
(
SYSTEM
${
HDF5_INCLUDE_DIRS
}
)
...
...
This diff is collapsed.
Click to expand it.
aocommon
@
2fb9631c
Compare
cd1a70fc
...
2fb9631c
Subproject commit
cd1a70fc9be1d80c0f3893acf76f3d7a63b15f7c
Subproject commit
2fb9631ca2a89db53241405acef4c507a94abbd4
This diff is collapsed.
Click to expand it.
schaapcommon
@
5a9b7979
Compare
6fd6a927
...
5a9b7979
Subproject commit
6fd6a927852722fc9afd12a4febec45bf5dbeab4
Subproject commit
5a9b7979cf55ee8fa475612124b6873a6437ec3f
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