diff options
| author | Ruben Undheim <ruben.undheim@gmail.com> | 2018-08-13 09:26:36 +0200 |
|---|---|---|
| committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-08-13 09:26:36 +0200 |
| commit | fc2afd3505b95adf339c9596374f087e4415bcda (patch) | |
| tree | 45441f6339dc8b4d265e72c6ac6ae5fde5d808f9 /CSXCAD/CMakeLists.txt | |
| parent | 66263903c78222d17d252f15db988c7c5936a2bc (diff) | |
| parent | 7097a4eaa0a32e0d02207521941157bda8968b05 (diff) | |
Merge tag 'upstream/0.0.35+ds.1'
Upstream version 0.0.35+ds.1
Diffstat (limited to 'CSXCAD/CMakeLists.txt')
| -rw-r--r-- | CSXCAD/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CSXCAD/CMakeLists.txt b/CSXCAD/CMakeLists.txt index a349287..9d516d5 100644 --- a/CSXCAD/CMakeLists.txt +++ b/CSXCAD/CMakeLists.txt @@ -6,14 +6,14 @@ ELSE() SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" ) ENDIF() -PROJECT(CSXCAD CXX) +PROJECT(CSXCAD CXX C) cmake_minimum_required(VERSION 2.8) # default set(LIB_VERSION_MAJOR 0) set(LIB_VERSION_MINOR 6) -set(LIB_VERSION_PATCH 1) +set(LIB_VERSION_PATCH 2) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) set(VERSION "v${LIB_VERSION_STRING}") @@ -91,7 +91,7 @@ find_package(TinyXML REQUIRED) ADD_DEFINITIONS( -DTIXML_USE_STL ) find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) -INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR}) +INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS}) link_directories(${HDF5_LIBRARY_DIRS}) # hdf5 compat ADD_DEFINITIONS( -DH5_USE_16_API ) |