Mercurial > hg > minc-tools
changeset 2650:30b3aa74a3ae
fixing compilatin issues
author | Vladimir S. FONOV <vladimir.fonov@gmail.com> |
---|---|
date | Thu, 29 Mar 2012 17:46:04 -0400 |
parents | eeba963396af |
children | 6665274ca051 |
files | CMakeLists.txt |
diffstat | 1 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,15 +205,15 @@ ) ENDIF(BUILD_EZMINC) -IF(BUILD_MINC4ITK AND BUILD_EZMINC) - set(MINC2_INCLUDE_DIRS_CONFIG +IF(BUILD_MINC4ITK AND BUILD_EZMINC AND ITK_FOUND) + set(MINC2_INCLUDE_DIRS_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/minc4itk ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/minc4itk ) -ENDIF(BUILD_MINC4ITK AND BUILD_EZMINC) +ENDIF(BUILD_MINC4ITK AND BUILD_EZMINC AND ITK_FOUND) # netcdf and HDF5 @@ -386,7 +386,6 @@ SET(minc_HEADERS ${minc1_HEADERS} ${minc2_HEADERS}) ENDIF(BUILD_MINC2) - IF(NOT itk-module) ADD_LIBRARY(${MINC2_LIBRARY} ${LIBRARY_TYPE} ${minc_LIB_SRCS} ) @@ -397,7 +396,7 @@ SET_TARGET_PROPERTIES(${MINC2_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR}) SET_TARGET_PROPERTIES(${VOLUME_IO_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR}) - ADD_DEPENDENCIES(${MINC2_LIBRARY} ${MINC2_DEPENDENCIES}) + #ADD_DEPENDENCIES(${MINC2_LIBRARY} ${MINC2_DEPENDENCIES}) ADD_DEPENDENCIES(${VOLUME_IO_LIBRARY} ${MINC2_LIBRARY}) INSTALL(TARGETS ${MINC2_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib) @@ -429,9 +428,9 @@ ADD_SUBDIRECTORY( ezminc ) ENDIF(BUILD_EZMINC) - IF(BUILD_MINC4ITK AND BUILD_EZMINC) + IF(BUILD_MINC4ITK AND BUILD_EZMINC AND ITK_FOUND) ADD_SUBDIRECTORY( minc4itk ) - ENDIF(BUILD_MINC4ITK AND BUILD_EZMINC) + ENDIF(BUILD_MINC4ITK AND BUILD_EZMINC AND ITK_FOUND) # config for the build directory set(MINC2_USE_FILE_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/UseMINC2.cmake)