diff options
author | Ruben Undheim <ruben.undheim@gmail.com> | 2018-08-13 09:26:34 +0200 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-08-13 09:26:34 +0200 |
commit | 7097a4eaa0a32e0d02207521941157bda8968b05 (patch) | |
tree | d4b1258d2601508182f8ff8b992d7e9431a7d20a /openEMS/CMakeLists.txt | |
parent | aa7abb5c97c20b34f159886dfc523dd8198fef98 (diff) |
New upstream version 0.0.35+ds.1
Diffstat (limited to 'openEMS/CMakeLists.txt')
-rw-r--r-- | openEMS/CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/openEMS/CMakeLists.txt b/openEMS/CMakeLists.txt index 5434138..898f280 100644 --- a/openEMS/CMakeLists.txt +++ b/openEMS/CMakeLists.txt @@ -6,13 +6,13 @@ ELSE() SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" ) ENDIF() -PROJECT(openEMS CXX) +PROJECT(openEMS CXX C) cmake_minimum_required(VERSION 2.8) # default set(LIB_VERSION_MAJOR 0) set(LIB_VERSION_MINOR 0) -set(LIB_VERSION_PATCH 34) +set(LIB_VERSION_PATCH 35) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) set(VERSION "v${LIB_VERSION_STRING}") @@ -21,7 +21,7 @@ IF(EXISTS ${PROJECT_SOURCE_DIR}/localConfig.cmake) include(${PROJECT_SOURCE_DIR}/localConfig.cmake) ENDIF() -set(VERSION "v0.0.34") +set(VERSION "v0.0.35") # add git revision IF(EXISTS ${PROJECT_SOURCE_DIR}/.git ) @@ -109,11 +109,8 @@ ADD_DEFINITIONS( -DTIXML_USE_STL ) # hdf5 find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) -INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR}) -link_directories(${HDF5_LIBRARY_DIRS}) - -# hdf5 compat -ADD_DEFINITIONS( -DH5_USE_16_API ) +INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS}) +link_directories(${HDF5_LIBRARIES}) # boost find_package(Boost 1.46 COMPONENTS @@ -158,6 +155,8 @@ set(SOURCES openems.cpp ) +set(PUB_HEADERS openems.h) + # libs ADD_SUBDIRECTORY( tools ) ADD_SUBDIRECTORY( FDTD ) @@ -181,6 +180,7 @@ TARGET_LINK_LIBRARIES( openEMS ${fparser_LIBRARIES} tinyxml ${HDF5_LIBRARIES} + ${HDF5_HL_LIBRARIES} ${Boost_LIBRARIES} ${vtk_LIBS} ${MPI_LIBRARIES} @@ -204,5 +204,6 @@ if (UNIX) PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) endif() endif () +INSTALL(FILES ${PUB_HEADERS} DESTINATION include/openEMS) INSTALL( DIRECTORY matlab DESTINATION share/openEMS ) # TODO mpi, tarball, debug, release |