Fixes for FindHDF5 changes in CMake 3.6.

src/CMakeLists.txt

@@ -24,7 +24,6 @@ set(APS2_VERSION_STRING ${APS2_VERSION_MAJOR}.${APS2_VERSION_MINOR}.${APS2_VERSI
 # look for HDF5
 FIND_PACKAGE(HDF5 REQUIRED COMPONENTS C CXX)
 INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} )
-LINK_DIRECTORIES( ${LINK_DIRECTORIES} ${HDF5_LIBRARY_DIRS} )
 
 # look for threading library
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -127,9 +126,9 @@ TARGET_LINK_LIBRARIES(dac_bist aps2)
 SET(bin_targets enumerate play_waveform play_sequence flash reset program dac_bist run_tests)
 
 if(WIN32)
-TARGET_LINK_LIBRARIES(aps2 hdf5 hdf5_cpp ws2_32 iphlpapi Threads::Threads)
+TARGET_LINK_LIBRARIES(aps2 ${HDF5_CXX_LIBRARIES} ws2_32 iphlpapi Threads::Threads)
 else(WIN32)
-TARGET_LINK_LIBRARIES(aps2 hdf5 hdf5_cpp Threads::Threads)
+TARGET_LINK_LIBRARIES(aps2 ${HDF5_CXX_LIBRARIES} Threads::Threads)
 endif(WIN32)
 
 # installation section
@@ -152,10 +151,10 @@ IF(UNIX AND NOT APPLE)
 	FILE(GLOB LIBGCC_ALL ${LIBGCC_DIR}/libgcc*.so.1)
 	FIND_LIBRARY(STDCPP NAMES libstdc++.so.6 HINTS ${GCC_PATH}/../lib64)
 	FILE(GLOB STDCPP_ALL ${STDCPP}*)
-	FIND_LIBRARY(HDF5LIB NAMES hdf5 HINTS ${HDF5_LIBRARY_DIRS})
-	FILE(GLOB HDF5LIB_ALL ${HDF5LIB}.*)
-	FIND_LIBRARY(HDF5CPPLIB NAMES hdf5_cpp HINTS ${HDF5_LIBRARY_DIRS})
-	FILE(GLOB HDF5CPPLIB_ALL ${HDF5CPPLIB}.*)
+	FILE(GLOB HDF5LIB_ALL ${HDF5_C_LIBRARIES}*)
+	# the CPP lib seems to be the first library listed in HDF5_CXX_LIBRARIES
+	LIST(GET HDF5_CXX_LIBRARIES 0 HDF5CPPLIB)
+	FILE(GLOB HDF5CPPLIB_ALL ${HDF5CPPLIB}*)
 	SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
 		${LIBGCC_ALL}
 		${STDCPP_ALL}