Mercurial > hg > minc-tools
changeset 2593:6c85a80d4692
Fixing minc cmake files
| author | Vladimir Fonov <vladimir.fonov@gmail.com> |
|---|---|
| date | Wed, 18 Jan 2012 18:00:00 -0500 |
| parents | b25a2deca01c |
| children | 7ab05909dd57 |
| files | CMakeLists.txt MINC2Config.cmake.in UseMINC2.cmake.in |
| diffstat | 3 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,8 @@ IF(BUILD_MINC2) IF(USE_SYSTEM_HDF5 ) +# SET(HDF5_FIND_COMPONENTS "C") +# SET(HDF5_USE_STATIC_LIBRARIES ON) FIND_PACKAGE(HDF5 REQUIRED) ELSE(USE_SYSTEM_HDF5) @@ -383,9 +385,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/UseMINC2.cmake @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/UseMINC2.cmake ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/MINC2Config.cmake - DESTINATION lib/MINC2 + DESTINATION lib COMPONENT Development) +# install(FILES +# cmake-modules/FindHDF5.cmake cmake-modules/FindNETCDF.cmake +# DESTINATION lib +# COMPONENT Development) + # testing IF(BUILD_TESTING)
--- a/MINC2Config.cmake.in +++ b/MINC2Config.cmake.in @@ -2,6 +2,13 @@ set(HAVE_EZMINC @BUILD_EZMINC@) set(HAVE_MINC4ITK @BUILD_MINC4ITK@) + +set(NETCDF_INCLUDE_DIR "@NETCDF_INCLUDE_DIR@") +set(HDF5_INCLUDE_DIR "@HDF5_INCLUDE_DIR@") +set(NETCDF_LIBRARY "@NETCDF_LIBRARY@") +set(HDF5_LIBRARY "@HDF5_LIBRARY@") +set(ZLIB_LIBRARIES "@ZLIB_LIBRARIES@") + set(MINC2_INCLUDE_DIRS "@MINC2_INCLUDE_DIRS_CONFIG@") set(MINC2_LIBRARY_DIRS "@MINC2_LIBRARY_DIRS_CONFIG@") set(MINC2_USE_FILE "@MINC2_USE_FILE_CONFIG@")
--- a/UseMINC2.cmake.in +++ b/UseMINC2.cmake.in @@ -2,19 +2,20 @@ link_directories(${MINC2_LIBRARY_DIRS}) -FIND_PACKAGE(NETCDF REQUIRED) +#FIND_PACKAGE(NETCDF REQUIRED) INCLUDE_DIRECTORIES( ${NETCDF_INCLUDE_DIR} ) if(HAVE_MINC2) - FIND_PACKAGE(HDF5 REQUIRED) - FIND_PACKAGE(ZLIB REQUIRED) + #FIND_PACKAGE(HDF5 REQUIRED) + #FIND_PACKAGE(ZLIB REQUIRED) + INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIR} ) SET(MINC2 "1") ADD_DEFINITIONS( -DMINC2=1 ) - SET(MINC_LIBRARIES volume_io2 minc2 netcdf hdf5 z) + #SET(MINC_LIBRARIES volume_io2 minc2 netcdf hdf5 z) else(HAVE_MINC2) - SET(MINC_LIBRARIES volume_io minc netcdf ) + #SET(MINC_LIBRARIES volume_io minc netcdf ) endif(HAVE_MINC2)