build system: improve hdf5 link & includes

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>

CMakeLists.txt

@@ -78,12 +78,15 @@ INCLUDE_DIRECTORIES( ${CSXCAD_ROOT_DIR}/include/CSXCAD )
 find_package(TinyXML REQUIRED)
 ADD_DEFINITIONS( -DTIXML_USE_STL )
 
+# hdf5
 find_package(HDF5 REQUIRED)
 INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR})
+link_directories(${HDF5_LIBRARY_DIRS})
 
 # hdf5 compat
 ADD_DEFINITIONS( -DH5_USE_16_API )
 
+# boost
 find_package(Boost 1.46 COMPONENTS
   thread
   system
@@ -163,9 +166,7 @@ TARGET_LINK_LIBRARIES( openEMS
   tinyxml
   hdf5
   hdf5_hl
-  #${HDF_LIBRARIES}
   ${Boost_LIBRARIES}
-  #${VTK_LIBRARIES}
   ${vtk_LIBS}
 )
 

nf2ff/CMakeLists.txt

@@ -25,7 +25,8 @@ ADD_EXECUTABLE( nf2ff ${SOURCES} )
 TARGET_LINK_LIBRARIES( nf2ff
   tools
   tinyxml
-  ${HDF5_LIBRARIES}
+  hdf5
+  hdf5_hl
   ${Boost_LIBRARIES}
 )
 

openEMS.pro

@@ -94,8 +94,13 @@ unix:!macx {
     }
     LIBS += -lfparser
 
+    # tinyxml
     LIBS += -ltinyxml
     DEFINES += TIXML_USE_STL
+
+    #hdf5
+    !isEmpty(HDF5_ROOT) {LIBS += -L$$HDF5_ROOT}
+    INCLUDEPATH += /usr/include/hdf5/serial
     LIBS += -lboost_thread -lboost_system
     LIBS += -lhdf5_hl -lhdf5