From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 3 Mar 2010 16:36:48 +0000 (+0000)
Subject: upgrades
X-Git-Tag: CREATOOLS.2-0-3~38
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3c89f5c4cf526984c434f60781322bd3959c2da7;p=crea.git

upgrades
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ed3338..dd6c35f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,11 @@
+# ---------------------------------
+#
+# Unless you are an experimented cmake user,
+# have a look at :
+# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X
+# before starting
+# ---------------------------------
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(crea)
 
@@ -10,7 +18,6 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
 CREA_PREVENT_IN_SOURCE_BUILD()
 
-
 SET(USE_BOOST ON)
 
 OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 33499da..9fbe4e6 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -84,8 +84,7 @@ ENDIF(USE_KWWIDGETS)
 
 #-----------------------------------------------------------------------------
 IF(USE_ITK)
-  IF(NOT ITK_FOUND)	
-	
+  IF(NOT ITK_FOUND)
     # Search ITK
     FIND_PACKAGE(ITK)
     # If itk found
@@ -123,13 +122,13 @@ IF(USE_GDCM)
     IF(GDCM_FOUND)
       INCLUDE(${GDCM_USE_FILE})
       CREA_DEFINE( USE_GDCM )
-      
+
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for GDCM... found")
       MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
       MESSAGE ( STATUS "* Version   = ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
       MESSAGE ( STATUS "* Namespace = ${GDCM_NAME_SPACE}")
-      
+
       # Test that GDCM_NAME_SPACE is **NOT** "gdcm" or will conflict with 
       # embedded gdcm in ITK and will result in hard seg faults !
       IF(USE_ITK)
@@ -137,13 +136,13 @@ IF(USE_GDCM)
 	  MESSAGE(FATAL_ERROR "GDCM_NAME_SPACE value is 'gdcm' which conflicts with ITK embededd gdcm namespace : rebuild gdcm with another GDCM_NAME_SPACE value")
 	ENDIF (GDCM_NAME_SPACE STREQUAL "gdcm")
       ENDIF(USE_ITK)
-      
+
       MARK_AS_ADVANCED(GDCM_DIR)
-      
+
       SET(GDCM_LIBRARIES
         ${GDCM_LIBRARIES} 
 	)
-      
+
       # TODO : Test that GDCM was built with option "vtkgdcm"
       IF(USE_GDCM_VTK)
 	IF(USE_VTK)
@@ -168,7 +167,7 @@ IF(USE_GDCM2)
     # If gdcm found
     IF(GDCM_FOUND)
       INCLUDE(${GDCM_USE_FILE})
-      
+
       IF(NOT ${GDCM_MAJOR_VERSION} EQUAL 2)
 	MESSAGE(FATAL_ERROR "gdcm version 2 needed. found ${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}. Set GDCM_DIR to the gdcm version 2 directory")
       ENDIF(NOT ${GDCM_MAJOR_VERSION} EQUAL 2)
@@ -189,13 +188,13 @@ IF(USE_GDCM2)
 	  MESSAGE(FATAL_ERROR "GDCM_NAME_SPACE value is 'gdcm' which conflicts with ITK embededd gdcm namespace : rebuild gdcm with another GDCM_NAME_SPACE value")
 	ENDIF (GDCM_NAME_SPACE STREQUAL "gdcm")
       ENDIF(USE_ITK)
-      
+
       MARK_AS_ADVANCED(GDCM_DIR)
-      
+
       SET(GDCM_LIBRARIES
         ${GDCM_LIBRARIES} 
 	)
-      
+
       # TODO : Test that GDCM was built with option "vtkgdcm"
       IF(USE_GDCM_VTK)
 	IF(USE_VTK)
@@ -275,7 +274,7 @@ IF(USE_BOOST)
       MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
       INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})	 
       LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
-	   
+   
       CREA_DEFINE( USE_BOOST )
 	  IF(WIN32)
 		
@@ -285,7 +284,7 @@ IF(USE_BOOST)
 		#libboost_signals-vc71-mt-1_37
 		#libboost_filesystem-vc71-mt-1_37
 		#boost_date_time-vc71-mt-1_37
-	
+
 		#message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}")
 		IF(USE_DEBUG_LIB)
 			SET(BOOST_LIBRARIES
@@ -307,7 +306,7 @@ IF(USE_BOOST)
 		  SET(BOOST_LIBRARIES
 			boost_signals
 			boost_filesystem
-				boost_date_time
+			boost_date_time
 			boost_program_options
 			boost_regex
 			boost_thread
@@ -317,14 +316,14 @@ IF(USE_BOOST)
 			boost_signals-mt
 			boost_filesystem-mt
 			boost_date_time-mt
-				boost_system-mt
+			boost_system-mt
 			boost_program_options-mt
 			boost_regex-mt
 			boost_thread-mt	    
 			)
       	ENDIF(APPLE)	
       ENDIF(NOT WIN32)
-	  
+
       MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
     ELSE(Boost_FOUND)
       MESSAGE(FATAL_ERROR "boost C++ library not found - Set Boost_INCLUDE_DIR to the directory containing boost headers")