zcy
/
openEMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system: improve hdf5 link & includes 

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
pull/13/head
Thorsten Liebig 2015-05-04 20:01:23 +02:00
parent 988198f968
commit f3533ed630
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

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

3
nf2ff/CMakeLists.txt
View File

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

5
openEMS.pro
View File

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