From 81a225c55d4013db47b6214b20a2737c614caaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@astron.nl>
Date: Thu, 6 Aug 2020 10:32:17 +0200
Subject: [PATCH] Link no -Wl,--no-undefined
This uncovered some missing library-linkings to HDF5, which are solved as well.
---
CMakeLists.txt | 3 ++-
cpp/CMakeLists.txt | 2 +-
cpp/hamaker/CMakeLists.txt | 1 +
demo/comparison-oskar/main.cpp | 2 +-
demo/tElementBeamCommon.h | 5 +----
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551ba66a..848a5e07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,8 @@ cmake_policy(SET CMP0074 NEW)
endif()
# Set compile options
-add_compile_options(-std=c++11 "${OpenMP_CXX_FLAGS}" -Wall -Wl,--no-undefined)
+add_compile_options(-std=c++11 "${OpenMP_CXX_FLAGS}" -Wall)
+string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined")
if (NOT CMAKE_BUILD_TYPE MATCHES Debug)
add_compile_options(-DNDEBUG)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 9ce65a85..c20ab45c 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -33,8 +33,8 @@ add_library(everybeam SHARED
)
target_include_directories(everybeam PUBLIC ${CASACORE_INCLUDE_DIR})
-target_link_libraries(everybeam PUBLIC ${CASACORE_LIBRARIES})
target_link_libraries(everybeam PUBLIC hamaker lobes oskar)
+target_link_libraries(everybeam PUBLIC ${CASACORE_LIBRARIES} ${HDF5_LIBRARIES})
install (
TARGETS everybeam
diff --git a/cpp/hamaker/CMakeLists.txt b/cpp/hamaker/CMakeLists.txt
index e70febba..744ff1b8 100644
--- a/cpp/hamaker/CMakeLists.txt
+++ b/cpp/hamaker/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(${CMAKE_BINARY_DIR})
add_library(hamaker SHARED
hamakerelementresponse.cc
hamakercoeff.cc)
+target_link_libraries(hamaker PUBLIC ${HDF5_LIBRARIES})
string(TOLOWER ${CMAKE_PROJECT_NAME} projectname )
set_target_properties(hamaker PROPERTIES LIBRARY_OUTPUT_NAME "${projectname}-hamaker")
diff --git a/demo/comparison-oskar/main.cpp b/demo/comparison-oskar/main.cpp
index b3e25ac1..a8ea22d5 100644
--- a/demo/comparison-oskar/main.cpp
+++ b/demo/comparison-oskar/main.cpp
@@ -34,6 +34,6 @@ int main(int argc, char** argv){
}
}
- const long unsigned leshape [] = {(long unsigned int) N, N, 2, 2};
+ const long unsigned leshape [] = {(long unsigned int) N, (long unsigned int) N, 2, 2};
npy::SaveArrayAsNumpy("response.npy", false, 4, leshape, result);
}
diff --git a/demo/tElementBeamCommon.h b/demo/tElementBeamCommon.h
index f819cdfc..d8219d64 100644
--- a/demo/tElementBeamCommon.h
+++ b/demo/tElementBeamCommon.h
@@ -82,9 +82,6 @@ void run(everybeam::ElementResponseModel elementResponseModel, double frequency,
// Print frequency
std::clog << "Frequency: " << frequency * 1e-6 << " Mhz" << std::endl;
- // Set number of stations to 1
- size_t nr_stations = 1;
-
// Read number of timesteps
size_t nr_timesteps = ms.nrow();
std::clog << "Number of timesteps: " << nr_timesteps << std::endl;
@@ -112,7 +109,7 @@ void run(everybeam::ElementResponseModel elementResponseModel, double frequency,
std::clog << "DEC: " << zenithDec << std::endl;
// Imaging parameters
- float image_size = M_PI; // in radians
+ // float image_size = M_PI; // in radians
size_t subgrid_size = 32; // in pixels
// Compute element beams from theta, phi
--
GitLab