Mercurial > hg > minc-tools
changeset 2668:fe74d6f85ccf
fixed a bug when not all files were installed
author | Vladimir S. FONOV <vladimir.fonov@gmail.com> |
---|---|
date | Wed, 11 Apr 2012 12:20:30 -0400 |
parents | 8da0a6ec9c45 |
children | a4b748a4eedb |
files | CMakeLists.txt conversion/CMakeLists.txt |
diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ IF(USE_ITK_HDF5) SET(HDF5_INCLUDE_DIR "${ITKHDF5_INCLUDE_DIRS}/itkhdf5") # a hack? SET(HDF5_LIBRARY ${ITKHDF5_LIBRARIES}) - SET(ZLIB_LIBRARIES ${ITKZLIB_LIBRARIES}) + SET(ZLIB_LIBRARY ${ITKZLIB_LIBRARIES}) ELSE(USE_ITK_HDF5) FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(HDF5 REQUIRED) @@ -302,7 +302,7 @@ SET(minc_LIB_SRCS ${minc1_LIB_SRCS} ${minc2_LIB_SRCS}) SET(minc_HEADERS ${minc1_HEADERS} ${minc2_HEADERS}) SET(MINC2_LIBRARY minc2) - SET(MINC2_LIBRARIES ${MINC2_LIBRARY} ${HDF5_LIBRARY} ${NETCDF_LIBRARY} ${ZLIB_LIBRARIES} m ) + SET(MINC2_LIBRARIES ${MINC2_LIBRARY} ${HDF5_LIBRARY} ${NETCDF_LIBRARY} ${ZLIB_LIBRARY} m ) SET(VOLUME_IO_LIBRARY volume_io2) ELSE(MINC2_BUILD_V2) @@ -312,7 +312,7 @@ ADD_LIBRARY(${MINC2_LIBRARY} ${LIBRARY_TYPE} ${minc_LIB_SRCS} ) -TARGET_LINK_LIBRARIES(${MINC2_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${ZLIB_LIBRARIES} m ) +TARGET_LINK_LIBRARIES(${MINC2_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${ZLIB_LIBRARY} m ) ADD_LIBRARY(${VOLUME_IO_LIBRARY} ${LIBRARY_TYPE} ${volume_io_LIB_SRCS}) TARGET_LINK_LIBRARIES(${VOLUME_IO_LIBRARY} ${MINC2_LIBRARY}) @@ -324,7 +324,7 @@ INSTALL(TARGETS ${MINC2_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib) INSTALL(TARGETS ${VOLUME_IO_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib) -INSTALL(FILES ${minc2_HEADERS} DESTINATION include ) +INSTALL(FILES ${minc_HEADERS} DESTINATION include ) INSTALL(FILES ${volume_io_HEADERS} DESTINATION include/volume_io) IF(MINC2_BUILD_TOOLS)