From a762c980b979f7d3b92d3190e04bdb374d15ce3d Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sat, 10 Jul 2021 21:39:09 +0200 Subject: [PATCH] Update CMakeLists.txt --- cmake/CMakeLists.txt | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 1643232b25..6737c6db4d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -120,6 +120,7 @@ UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR) UNIFY_ENVVARS_AND_CACHE(PYTHON_EXECUTABLE) UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR) UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR) +UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES) UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT) UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR) @@ -422,16 +423,20 @@ if(HDF5_SUPPORT) "${HDF5_LIBRARY_DIR}/libhdf5_cpp.lib" "${HDF5_LIBRARY_DIR}/libhdf5.lib" "${HDF5_LIBRARY_DIR}/libzlib.lib" - "${HDF5_LIBRARY_DIR}/libsz.lib" - "${HDF5_LIBRARY_DIR}/libaec.lib") + "${HDF5_LIBRARY_DIR}/libsz.lib" + "${HDF5_LIBRARY_DIR}/libaec.lib") ELSE() - SET(HDF5_LIBRARIES - "${HDF5_LIBRARY_DIR}/hdf5_cpp.a" - "${HDF5_LIBRARY_DIR}/hdf5.a" - "${HDF5_LIBRARY_DIR}/libzlib.a" - "${HDF5_LIBRARY_DIR}/libsz.a" - "${HDF5_LIBRARY_DIR}/libaec.a" - zlib) + if (NOT HDF5_LIBRARIES) + SET(HDF5_LIBRARIES + /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.a + /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.a + /usr/lib/x86_64-linux-gnu/libz.a + /usr/lib/x86_64-linux-gnu/libsz.a + /usr/lib/x86_64-linux-gnu/libaec.a + dl + ) + endif() + # An additional lib- prefix is added by HDF5 to denote static libraries ENDIF() endif()