Mercurial > hg > minc-tools
diff CMakeLists.txt @ 2550:1a69a4b622eb
finished beatifying cmake scripts
author | Vladimir S. FONOV <vladimir.fonov@gmail.com> |
---|---|
date | Thu, 08 Dec 2011 18:35:49 -0500 (2011-12-08) |
parents | dcef05d4c2e2 |
children | 3fe122bac48b |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,11 +30,6 @@ OPTION(BUILD_MINC2 "Support minc2 file format" ON) -# yes, build as minc2 -IF(BUILD_MINC2) - SET(MINC2 "1") -ENDIF(BUILD_MINC2) - ADD_DEFINITIONS(-DHAVE_CONFIG_H) # aliases @@ -50,15 +45,15 @@ CHECK_INCLUDE_FILES(float.h HAVE_FLOAT_H) # netcdf and HDF5 -SET(NETCDF_FIND_REQUIRED TRUE) -FIND_PACKAGE(NETCDF) +FIND_PACKAGE(NETCDF REQUIRED) INCLUDE_DIRECTORIES( ${NETCDF_INCLUDE_DIR} ) IF(BUILD_MINC2) - SET(HDF5_FIND_REQUIRED TRUE) + FIND_PACKAGE(HDF5 REQUIRED) + FIND_PACKAGE(ZLIB REQUIRED) + SET(MINC2 "1") INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIR} ) ENDIF(BUILD_MINC2) -FIND_PACKAGE(HDF5) # config files for build CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h) @@ -119,6 +114,9 @@ SET(minc_LIB_SRCS ${minc1_LIB_SRCS} ${minc2_LIB_SRCS}) SET(minc_LIB minc2) ADD_LIBRARY(minc2 STATIC ${minc_LIB_SRCS} ) + + TARGET_LINK_LIBRARIES(minc2 ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${ZLIB_LIBRARIES} m ) + INSTALL(TARGETS minc2 DESTINATION lib) INSTALL(FILES libsrc/minc.h libsrc/ParseArgv.h @@ -139,6 +137,7 @@ SET(minc_LIB_SRCS ${minc1_LIB_SRCS} ) SET(minc_LIB minc) ADD_LIBRARY(minc STATIC ${minc1_LIB_SRCS} ) + TARGET_LINK_LIBRARIES(minc ${NETCDF_LIBRARY} ) INSTALL(TARGETS minc DESTINATION lib) INSTALL(FILES libsrc/minc.h libsrc/ParseArgv.h @@ -200,10 +199,13 @@ ADD_LIBRARY(volume_io2 STATIC ${volume_io_LIB_SRCS}) INSTALL(TARGETS volume_io2 DESTINATION lib) SET_TARGET_PROPERTIES(volume_io2 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) + SET( volume_io_LIB volume_io2) + ELSE(BUILD_MINC2) ADD_LIBRARY(volume_io STATIC ${volume_io_LIB_SRCS}) INSTALL(TARGETS volume_io DESTINATION lib) SET_TARGET_PROPERTIES(volume_io PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}) + SET( volume_io_LIB volume_io) ENDIF(BUILD_MINC2) INSTALL(FILES volume_io/Include/volume_io/alloc.h