# HG changeset patch # User Vladimir S. FONOV # Date 1333486124 14400 # Node ID 24bd443790fae99524477ba2ec1f1959b2101758 # Parent 9aaff1b83834f6b9e518c6fe06e5e123547b50d3 Making shure that unique variable names are used for configuring diff --git a/CMakeLists.txt b/CMakeLists.txt --- 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 diff --git a/ezminc/CMakeLists.txt b/ezminc/CMakeLists.txt --- a/ezminc/CMakeLists.txt +++ b/ezminc/CMakeLists.txt @@ -1,4 +1,3 @@ -OPTION(MINC2_BUILD_EZMINC_EXAMPLES "Build EZminc examples" ON) IF(MINC2_BUILD_V2) ADD_DEFINITIONS( -DMINC2 )