Mercurial > hg > minc-tools

changeset 2665:24bd443790fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Making shure that unique variable names are used for configuring
author Vladimir S. FONOV <vladimir.fonov@gmail.com>
date Tue, 03 Apr 2012 16:48:44 -0400
parents 9aaff1b83834
children b1b77cec4e17
files CMakeLists.txt ezminc/CMakeLists.txt
diffstat 2 files changed, 13 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
--- 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 )