Merge pull request #247 from dls-controls/fix-find-hdf5

Rename HDF5HL_LIBRARIES to HDF5_HL_LIBRARIES to fix FindHDF5
odin-detector · Nov 4, 2020 · 1eea41a · 1eea41a
2 parents 4240fd2 + a9dc2b8
commit 1eea41a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,15 +99,15 @@ IF (HDF5_ROOT)
  NAMES hdf5
  PATHS ${HDF5_ROOT}/lib
  NO_DEFAULT_PATH )
- find_library( HDF5HL_LIBRARIES
+ find_library( HDF5_HL_LIBRARIES
  NAMES hdf5_hl
  PATHS ${HDF5_ROOT}/lib
  NO_DEFAULT_PATH )
- if (HDF5HL_LIBRARIES)
+ if (HDF5_HL_LIBRARIES)
  set(HDF5_FOUND true)
- else (HDF5HL_LIBRARIES)
+ else (HDF5_HL_LIBRARIES)
  set(HDF5_FOUND false)
- endif (HDF5HL_LIBRARIES)
+ endif (HDF5_HL_LIBRARIES)
 ELSE(HDF5_ROOT)
  # If no HDF5_ROOT variable has been set then we just
  # use the built-in FindHDF5.cmake...

diff --git a/frameProcessor/src/CMakeLists.txt b/frameProcessor/src/CMakeLists.txt
@@ -31,10 +31,10 @@ file(GLOB APP_SOURCES FrameProcessorController.cpp
 add_executable(frameProcessor ${APP_SOURCES} FrameProcessorApp.cpp)
 
 message(STATUS "HDF5 include files: " ${HDF5_INCLUDE_DIRS})
-message(STATUS "HDF5 libs: " ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES})
+message(STATUS "HDF5 libs: " ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
 message(STATUS "HDF5 defs: " ${HDF5_DEFINITIONS})
 
-target_link_libraries(frameProcessor ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES} ${COMMON_LIBRARY})
+target_link_libraries(frameProcessor ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${COMMON_LIBRARY})
 if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux )
  find_library(PTHREAD_LIBRARY
  NAMES pthread)
@@ -45,7 +45,7 @@ install(TARGETS frameProcessor RUNTIME DESTINATION bin)
 
 # Add library for dummy plugin
 add_library(DummyUDPProcessPlugin SHARED DummyUDPProcessPlugin.cpp DummyUDPProcessPluginLib.cpp)
-target_link_libraries(DummyUDPProcessPlugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES} ${COMMON_LIBRARY})
+target_link_libraries(DummyUDPProcessPlugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${COMMON_LIBRARY})
 install(TARGETS DummyUDPProcessPlugin DESTINATION lib)
 
 # Add library for Blosc plugin
@@ -58,17 +58,17 @@ endif()
 
 # Add library for HDF5 writer plugin
 add_library(Hdf5Plugin SHARED FileWriterPlugin.cpp FileWriterPluginLib.cpp HDF5File.cpp Acquisition.cpp)
-target_link_libraries(Hdf5Plugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES} ${COMMON_LIBRARY})
+target_link_libraries(Hdf5Plugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${COMMON_LIBRARY})
 install(TARGETS Hdf5Plugin DESTINATION lib)
 
 # Add library for ParameterAdjustment plugin
 add_library(ParameterAdjustmentPlugin SHARED ParameterAdjustmentPlugin.cpp ParameterAdjustmentPluginLib.cpp)
-target_link_libraries(ParameterAdjustmentPlugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES} ${COMMON_LIBRARY})
+target_link_libraries(ParameterAdjustmentPlugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${COMMON_LIBRARY})
 install(TARGETS ParameterAdjustmentPlugin DESTINATION lib)
 
 # Add library for OffsetAdjustment plugin
 add_library( OffsetAdjustmentPlugin SHARED OffsetAdjustmentPlugin.cpp OffsetAdjustmentPluginLib.cpp)
-target_link_libraries(OffsetAdjustmentPlugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES} ${COMMON_LIBRARY})
+target_link_libraries(OffsetAdjustmentPlugin ${LIB_PROCESSOR} ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${COMMON_LIBRARY})
 install(TARGETS OffsetAdjustmentPlugin DESTINATION lib)
 
 # Add library for LiveView plugin

diff --git a/frameProcessor/test/CMakeLists.txt b/frameProcessor/test/CMakeLists.txt
@@ -27,7 +27,7 @@ target_link_libraries(frameProcessorTest
  ${LOG4CXX_LIBRARIES}
  ${ZEROMQ_LIBRARIES}
  ${HDF5_LIBRARIES}
- ${HDF5HL_LIBRARIES}
+ ${HDF5_HL_LIBRARIES}
  Hdf5Plugin
  ParameterAdjustmentPlugin
  OffsetAdjustmentPlugin

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,4 +3,4 @@ add_subdirectory(integrationTest)
 include_directories(${HDF5_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS}/.. ${ZEROMQ_INCLUDE_DIRS})
 add_definitions(${HDF5_DEFINITIONS})
 add_executable(test_rewind test_rewind.cpp)
-target_link_libraries(test_rewind ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES} ${COMMON_LIBRARY})
+target_link_libraries(test_rewind ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ${ZEROMQ_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${COMMON_LIBRARY})
diff --git a/test/integrationTest/src/CMakeLists.txt b/test/integrationTest/src/CMakeLists.txt
@@ -26,7 +26,7 @@ add_executable(odinDataTest ${ODINDATA_SOURCES})
 add_executable(frameTests ${FRAMETEST_SOURCES})
 
 message(STATUS "HDF5 include files: " ${HDF5_INCLUDE_DIRS})
-message(STATUS "HDF5 libs: " ${HDF5_LIBRARIES} ${HDF5HL_LIBRARIES})
+message(STATUS "HDF5 libs: " ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
 message(STATUS "HDF5 defs: " ${HDF5_DEFINITIONS})
 
 target_link_libraries(odinDataTest ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${LOG4CXX_LIBRARIES} ${COMMON_LIBRARY})