Mercurial > hg > minc-tools
changeset 2667:8da0a6ec9c45
Merge branch 'minc4itk' of github.com:vfonov/minc into minc4itk
| author | Vladimir S. FONOV <vladimir.fonov@gmail.com> |
|---|---|
| date | Wed, 11 Apr 2012 11:57:17 -0400 |
| parents | 5189bc0a26e7 (current diff) b1b77cec4e17 (diff) |
| children | fe74d6f85ccf |
| files | |
| diffstat | 2 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,16 +31,20 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${MINC2_PACKAGE_VERSION_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${MINC2_PACKAGE_VERSION_PATCH}) + OPTION(MINC2_BUILD_SHARED_LIBS "Build minc2 with shared libraries." OFF) + INCLUDE(CPack) + + OPTION(MINC2_BUILD_V2 "Support minc2 file format" ON) + OPTION(MINC2_BUILD_TOOLS "Build minc tools (mincreshape,mincresample, etc)" ON) + OPTION(MINC2_BUILD_CONVERTERS "Build minc conversion programs (mnc2nii, nii2mnc , dcm2mnc...)" ON) + OPTION(MINC2_BUILD_EZMINC "Build C++ interface library EZminc" ON) + OPTION(MINC2_BUILD_EZMINC_EXAMPLES "Build EZminc examples" ON) + ENDIF(NOT MINC2_EXTERNALLY_CONFIGURED) #ADD_SUBDIRECTORY( doc ) -OPTION(MINC2_BUILD_V2 "Support minc2 file format" ON) -OPTION(MINC2_BUILD_TOOLS "Build minc tools (mincreshape,mincresample, etc)" ON) -OPTION(MINC2_BUILD_CONVERTERS "Build minc conversion programs (mnc2nii, nii2mnc , dcm2mnc...)" ON) -OPTION(MINC2_BUILD_EZMINC "Build C++ interface library EZminc" ON) -OPTION(MINC2_BUILD_SHARED_LIBS "Build minc2 with shared libraries." OFF) IF(MINC2_BUILD_V2 AND NOT MINC2_EXTERNALLY_CONFIGURED) @@ -53,16 +57,16 @@ ELSE(ITK_FOUND AND ITK_VERSION_MAJOR VERSION_EQUAL 4) # check if using ITK HDF5 library SET(USE_ITK_HDF5 OFF) ENDIF(ITK_FOUND AND ITK_VERSION_MAJOR VERSION_EQUAL 4) # check if using ITK HDF5 library - + ENDIF(MINC2_BUILD_V2 AND NOT MINC2_EXTERNALLY_CONFIGURED) -IF(BUILD_SHARED_LIBS) +IF(MINC2_BUILD_SHARED_LIBS) SET(LIBRARY_TYPE SHARED) SET(LIBRARY_INSTALL LIBRARY) -ELSE(BUILD_SHARED_LIBS) +ELSE(MINC2_BUILD_SHARED_LIBS) SET(LIBRARY_TYPE STATIC) SET(LIBRARY_INSTALL ARCHIVE) -ENDIF(BUILD_SHARED_LIBS) +ENDIF(MINC2_BUILD_SHARED_LIBS) # external packages @@ -311,6 +315,7 @@ TARGET_LINK_LIBRARIES(${MINC2_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${ZLIB_LIBRARIES} m ) ADD_LIBRARY(${VOLUME_IO_LIBRARY} ${LIBRARY_TYPE} ${volume_io_LIB_SRCS}) +TARGET_LINK_LIBRARIES(${VOLUME_IO_LIBRARY} ${MINC2_LIBRARY}) 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}) @@ -343,6 +348,13 @@ ${CMAKE_CURRENT_SOURCE_DIR}/volume_io/Include ) +IF(MINC2_BUILD_EZMINC) + set(MINC2_INCLUDE_DIRS_CONFIG + ${MINC2_INCLUDE_DIRS_CONFIG} + ${CMAKE_CURRENT_SOURCE_DIR}/ezminc) +ENDIF(MINC2_BUILD_EZMINC) + + IF(MINC2_BUILD_V2) set(MINC2_INCLUDE_DIRS_CONFIG ${MINC2_INCLUDE_DIRS_CONFIG}