Mercurial > hg > minc-tools

changeset 2646:199f91058105

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modifying to build withing minc-toolkit
author Vladimir S. FONOV <vladimir.fonov@gmail.com>
date Tue, 20 Mar 2012 12:25:26 -0400
parents d7d5ce3e8a64
children 862428fcdbce
files CMakeLists.txt progs/CMakeLists.txt
diffstat 2 files changed, 32 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@
     INCLUDE(BuildNETCDF)
     INCLUDE(BuildHDF5)
     SET(ENABLE_SUPERBUILD ON)
-    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.2 )
+  ELSE(CMAKE_VERSION VERSION_GREATER 2.8.2 )
     SET(ENABLE_SUPERBUILD OFF)
   ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.2)
   
@@ -28,7 +28,11 @@
   SET(CPACK_PACKAGE_VERSION_MAJOR ${MINC2_PACKAGE_VERSION_MAJOR})
   SET(CPACK_PACKAGE_VERSION_MINOR ${MINC2_PACKAGE_VERSION_MINOR})
   SET(CPACK_PACKAGE_VERSION_PATCH ${MINC2_PACKAGE_VERSION_PATCH})
+  
   INCLUDE(CPack)
+
+  FIND_PACKAGE(ITK QUIET)
+  
 ENDIF(NOT MINC_TOOLKIT_BUILD)
 
 #ADD_SUBDIRECTORY( doc )
@@ -52,17 +56,14 @@
   SET(USE_SYSTEM_NETCDF ON)
 ENDIF(ENABLE_SUPERBUILD)
 
-FIND_PACKAGE(ITK QUIET)
-
 IF(BUILD_EZMINC AND ITK_FOUND)
   OPTION(BUILD_MINC4ITK   "Build ITK interface" ON)
 ENDIF(BUILD_EZMINC AND ITK_FOUND)
 
-IF(BUILD_MINC2)
+IF(BUILD_MINC2 AND NOT MINC_TOOLKIT_BUILD)
  IF(ITK_FOUND AND ITK_VERSION_MAJOR VERSION_EQUAL 4) # check if using ITK HDF5 library
-
   IF(ITKHDF5_LOADED)
-		message(WARNING "ITK compiled with HDF5 support!")
+		MESSAGE(WARNING "ITK compiled with HDF5 support!")
     SET(USE_ITK_HDF5 ON)
   ELSE(ITKHDF5_LOADED)
     SET(USE_ITK_HDF5 OFF)
@@ -75,8 +76,7 @@
 		SET(USE_SYSTEM_HDF5 ON)
   ENDIF(ENABLE_SUPERBUILD)
  ENDIF(ITK_FOUND AND ITK_VERSION_MAJOR VERSION_EQUAL 4) # check if using ITK HDF5 library
-
-ENDIF(BUILD_MINC2)
+ENDIF(BUILD_MINC2 AND NOT MINC_TOOLKIT_BUILD)
 
 IF(BUILD_SHARED_LIBS)
   SET(LIBRARY_TYPE SHARED)
@@ -86,31 +86,40 @@
   SET(LIBRARY_INSTALL ARCHIVE)
 ENDIF(BUILD_SHARED_LIBS)
 
+
 # external packages
-IF(USE_SYSTEM_NETCDF)
-  FIND_PACKAGE(NETCDF REQUIRED)
-ELSE(USE_SYSTEM_NETCDF)
-  build_netcdf(${CMAKE_INSTALL_PREFIX})
-ENDIF(USE_SYSTEM_NETCDF)
+IF(NOT MINC_TOOLKIT_BUILD)
+  IF(USE_SYSTEM_NETCDF AND NOT MINC_TOOLKIT_BUILD)
+    FIND_PACKAGE(NETCDF REQUIRED)
+  ELSE(USE_SYSTEM_NETCDF AND NOT MINC_TOOLKIT_BUILD)
+    build_netcdf(${CMAKE_INSTALL_PREFIX})
+  ENDIF(USE_SYSTEM_NETCDF AND NOT MINC_TOOLKIT_BUILD)
+ENDIF(NOT MINC_TOOLKIT_BUILD)
 
 
-IF(BUILD_MINC2)
+IF(BUILD_MINC2 AND NOT MINC_TOOLKIT_BUILD)
   IF(USE_ITK_HDF5)
     SET(HDF5_INCLUDE_DIR ${ITKHDF5_INCLUDE_DIRS})
     SET(HDF5_LIBRARY ${ITKHDF5_LIBRARIES})
     SET(ZLIB_LIBRARIES ${ITKZLIB_LIBRARIES})
-    
   ELSE(USE_ITK_HDF5)
     FIND_PACKAGE(ZLIB REQUIRED)
-
-    IF(USE_SYSTEM_HDF5 )
+    IF(USE_SYSTEM_HDF5)
       FIND_PACKAGE(HDF5 REQUIRED)
     ELSE(USE_SYSTEM_HDF5)
       build_hdf5(${CMAKE_INSTALL_PREFIX})
     ENDIF(USE_SYSTEM_HDF5)
-    
   ENDIF(USE_ITK_HDF5)
-ENDIF(BUILD_MINC2)
+  
+  IF(ZLIB_FOUND)
+    SET(HAVE_ZLIB 1)
+  ELSE(ZLIB_FOUND)
+    FIND_PACKAGE(ZLIB)
+    IF(ZLIB_FOUND)
+      SET(HAVE_ZLIB 1)
+    ENDIF(ZLIB_FOUND)
+  ENDIF(ZLIB_FOUND)
+ENDIF(BUILD_MINC2 AND NOT MINC_TOOLKIT_BUILD)
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
@@ -162,14 +171,6 @@
 CHECK_INCLUDE_FILES(pwd.h       HAVE_PWD_H)
 
 
-IF(ZLIB_FOUND)
-  SET(HAVE_ZLIB 1)
-ELSE(ZLIB_FOUND)
-  FIND_PACKAGE(ZLIB)
-  IF(ZLIB_FOUND)
-    SET(HAVE_ZLIB 1)
-  ENDIF(ZLIB_FOUND)
-ENDIF(ZLIB_FOUND)
 
 IF(BUILD_EZMINC)
   set(MINC2_INCLUDE_DIRS_CONFIG    
--- a/progs/CMakeLists.txt
+++ b/progs/CMakeLists.txt
@@ -2,19 +2,15 @@
 #
 # Andrew Janke - a.janke@gmail.com
 
-#SET(CMAKE_MODULE_PATH "cmake-modules")
-
-#LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/..)
 INCLUDE_DIRECTORIES(Proglib)
 
 LINK_LIBRARIES( ${MINC2_LIBRARIES} )
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
-#SET(BISON_FIND_REQUIRED)
-#SET(FLEX_FIND_REQUIRED)
-
-FIND_PACKAGE(BISON)
-FIND_PACKAGE(FLEX)
+IF(NOT MINC_TOOLKIT_BUILD)
+  FIND_PACKAGE(BISON)
+  FIND_PACKAGE(FLEX)
+ENDIF(NOT MINC_TOOLKIT_BUILD)
 
 # all the progs
 ADD_EXECUTABLE(invert_raw_image mincview/invert_raw_image.c)