Skip to content
Snippets Groups Projects
Commit 56e81b23 authored by Maik Nijhuis's avatar Maik Nijhuis
Browse files

Remove dependency on C compiler

parent b28377ed
No related branches found
No related tags found
1 merge request!410Remove dependency on C compiler
Pipeline #123487 failed
......@@ -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)
......
......@@ -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})
......
Subproject commit cd1a70fc9be1d80c0f3893acf76f3d7a63b15f7c
Subproject commit 2fb9631ca2a89db53241405acef4c507a94abbd4
Subproject commit 6fd6a927852722fc9afd12a4febec45bf5dbeab4
Subproject commit 5a9b7979cf55ee8fa475612124b6873a6437ec3f
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment