From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Tue, 12 Oct 2010 14:42:35 +0000 (+0000)
Subject: bug with gdcm2 on Linux
X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~21
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8426ba07aa7aced7b0c4ab7d693e9b50e83b36d6;p=crea.git

bug with gdcm2 on Linux
---

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 523c261..1a4f021 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -3,7 +3,7 @@
 MACRO(CREA_FIND_AND_USE_LIBRARIES)
 #MESSAGE(ERROR "EED CREAMacrp_FindAndUseLibraries")
 IF(INCLUDE_CTEST)
-	include(CTest) 
+	include(CTEST) 
 ENDIF(INCLUDE_CTEST)
 
 
@@ -157,9 +157,11 @@ IF(USE_GDCM)
             )
 	ENDIF(USE_VTK)
       ENDIF(USE_GDCM_VTK)
+
     ELSE(GDCM_FOUND)     
 	  MESSAGE(FATAL_ERROR "GDCM not found....")
     ENDIF(GDCM_FOUND)
+
   ENDIF(NOT GDCM_FOUND)
 ENDIF(USE_GDCM)
 
@@ -193,14 +195,22 @@ IF(USE_GDCM2)
 
       IF(USE_GDCM_VTK)
 	IF(USE_VTK)
-	  SET(GDCM_LIBRARIES
-  	    ${GDCM_LIBRARIES}
-		vtkgdcm2
-		gdcm2vtk
-            )
+		IF(WIN32)
+		  SET(GDCM_LIBRARIES
+	  	    ${GDCM_LIBRARIES}
+			vtkgdcm
+			gdcm2vtk
+            	     )
+		ELSE(WIN32)
+		    SET(GDCM_LIBRARIES
+	  	    ${GDCM_LIBRARIES}
+			vtkgdcm
+			)
+		ENDIF(WIN32)
+		
 	ENDIF(USE_VTK)
       ENDIF(USE_GDCM_VTK)
-      
+     
 
 ENDIF(USE_GDCM2)
 
@@ -266,9 +276,7 @@ IF(USE_TTH)
   ENDIF(NOT TTH_EXECUTABLE)
 ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------
-
 IF(USE_BOOST)
 message(STATUS "1")
   IF(NOT Boost_FOUND)
@@ -328,34 +336,37 @@ message(STATUS "1")
     ENDIF(Boost_FOUND)
   ENDIF(NOT Boost_FOUND)
   message("${Boost_FOUND}")
+ 
+
 ENDIF(USE_BOOST)
 #-----------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-
 IF(USE_XERCES)
 
 	# FIND xerces
-	IF(WIN32)	
+	IF(WIN32)
+	
 		SET(XERCES_LIB_DIR $ENV{XERCES_DIR})
+	
 		IF(NOT XERCES_LIB_DIR)  
 		  MESSAGE(FATAL_ERROR "XERCES_DIR not found")  
 		ELSE(NOT XERCES_LIB_DIR)
-##EED  		  INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/src )		
-##EED		  LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug )
-		  INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include )		
-		  LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/lib )
+		  
+		INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include )		
+		LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/lib )
+		  
 		ENDIF(NOT XERCES_LIB_DIR)   	
+		
 		IF(USE_DEBUG_LIB)
-##EED		  set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug/xerces-c_3D)
-		  set(XERCES_LIBRARIES  xerces-c_3D)
+			set(XERCES_LIBRARIES  xerces-c_3D)
 		ELSE(USE_DEBUG_LIB)
-#EED		  set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Release/xerces-c_3)
-		  set(XERCES_LIBRARIES  xerces-c_3)
+			set(XERCES_LIBRARIES  xerces-c_3)
 		ENDIF(USE_DEBUG_LIB)
+		
 		MARK_AS_ADVANCED(XERCES_LIB_DIR)
 	ENDIF(WIN32)
 
+
 	IF(UNIX)
 		IF(APPLE)
 			SET(XERCES_LIBRARIES xerces-c )