Mercurial > hg > minc-tools
changeset 2555:425fa26827ab
Integrated minc4itk building
| author | Vladimir S. FONOV <vladimir.fonov@gmail.com> |
|---|---|
| date | Thu, 08 Dec 2011 19:01:10 -0500 |
| parents | f13ced4f31ae |
| children | 7cdc8b84f038 |
| files | CMakeLists.txt ezminc/CMakeLists.txt minc4itk/CMakeLists.txt |
| diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,10 @@ OPTION(BUILD_TOOLS "Build minc tools (mincreshape,mincresample, etc)" ON) OPTION(BUILD_CONVERTERS "Build minc conversion programs (mnc2nii, nii2mnc , dcm2mnc...)" ON) OPTION(BUILD_EZMINC "Build C++ interface library EZminc" ON) +IF(BUILD_EZMINC) +OPTION(BUILD_MINC4ITK "Build ITK interface" ON) +ENDIF(BUILD_EZMINC) + ADD_DEFINITIONS(-DHAVE_CONFIG_H) @@ -242,3 +246,7 @@ IF(BUILD_EZMINC) ADD_SUBDIRECTORY( ezminc ) ENDIF(BUILD_EZMINC) + +IF(BUILD_MINC4ITK AND BUILD_EZMINC) +ADD_SUBDIRECTORY( minc4itk ) +ENDIF(BUILD_MINC4ITK AND BUILD_EZMINC) \ No newline at end of file
--- a/ezminc/CMakeLists.txt +++ b/ezminc/CMakeLists.txt @@ -19,7 +19,9 @@ minc_1_simple_rw.cpp ) + ADD_LIBRARY( minc_io ${MINC_IO_HEADERS} ${MINC_IO_SRC}) +TARGET_LINK_LIBRARIES(minc_io ${minc_LIB}) INSTALL(TARGETS minc_io ARCHIVE DESTINATION lib) INSTALL(FILES ${MINC_IO_HEADERS} DESTINATION include)
--- a/minc4itk/CMakeLists.txt +++ b/minc4itk/CMakeLists.txt @@ -1,3 +1,5 @@ +FIND_PACKAGE(ITK REQUIRED) + IF(NOT ITK_LIBRARIES) MESSAGE( FATAL_ERROR "ITK libraries are not found!") ENDIF(NOT ITK_LIBRARIES) @@ -19,14 +21,6 @@ ${ITK_INCLUDE_DIRS} ) - -IF(USE_MINC2) - ADD_DEFINITIONS( -DMINC2 ) - LINK_LIBRARIES(volume_io2 minc2 netcdf hdf5 z) -ELSE(USE_MINC2) - LINK_LIBRARIES(volume_io minc netcdf) -ENDIF(USE_MINC2) - SET( MINC4ITK_HEADERS itkMincImageIOFactory.h minc_general_transform.h