From 56e81b23f8a935fbd2e917aa451a07cdb351705f Mon Sep 17 00:00:00 2001
From: Maik Nijhuis <maik.nijhuis@triopsys.nl>
Date: Tue, 27 May 2025 11:04:20 +0000
Subject: [PATCH] Remove dependency on C compiler
---
CMake/FindCasacore.cmake | 8 +++++++-
CMakeLists.txt | 7 +++++--
external/aocommon | 2 +-
external/schaapcommon | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/CMake/FindCasacore.cmake b/CMake/FindCasacore.cmake
index d5c066a0..caa65ad1 100644
--- a/CMake/FindCasacore.cmake
+++ b/CMake/FindCasacore.cmake
@@ -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)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917756fd..462a07d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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})
diff --git a/external/aocommon b/external/aocommon
index cd1a70fc..2fb9631c 160000
--- a/external/aocommon
+++ b/external/aocommon
@@ -1 +1 @@
-Subproject commit cd1a70fc9be1d80c0f3893acf76f3d7a63b15f7c
+Subproject commit 2fb9631ca2a89db53241405acef4c507a94abbd4
diff --git a/external/schaapcommon b/external/schaapcommon
index 6fd6a927..5a9b7979 160000
--- a/external/schaapcommon
+++ b/external/schaapcommon
@@ -1 +1 @@
-Subproject commit 6fd6a927852722fc9afd12a4febec45bf5dbeab4
+Subproject commit 5a9b7979cf55ee8fa475612124b6873a6437ec3f
--
GitLab