X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseLibraries.cmake;h=c317f0bf5e3225f98c683b2cefb542dfd54a0d2d;hb=f7f202e6ec71c0f88d211d6a78f88ba017dee851;hp=acd6c615a266a9b704e4138bee469dffb3b7a2a9;hpb=cf2d56c8153234e08e37eb01d4dbe6597bbbd76b;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index acd6c61..c317f0b 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -1,7 +1,7 @@
 
 
 MACRO(CREA_FIND_AND_USE_LIBRARIES)
-
+#MESSAGE(ERROR "EED CREAMacrp_FindAndUseLibraries")
 set(USE_DEBUG_LIB "" CACHE BOOL "Use Debug Libraries" )
 
 #-----------------------------------------------------------------------------
@@ -157,22 +157,18 @@ IF(USE_GDCM)
   ENDIF(NOT GDCM_FOUND)
 ENDIF(USE_GDCM)
 
-#-----------------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------
 IF(USE_GDCM2)
-  IF(NOT GDCM_FOUND)
     # Search GDCM2
-    FIND_PACKAGE(GDCM)
-    # If gdcm found
-    IF(GDCM_FOUND)
-      INCLUDE(${GDCM_USE_FILE})
+    FIND_PACKAGE(GDCM REQUIRED)
+    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)
       
       CREA_DEFINE( USE_GDCM2 )
+	  MARK_AS_ADVANCED(GDCM_DIR)
       CREA_DEFINE_WITH_VAL( GDCM_NAME_SPACE gdcm )
       
       MESSAGE ( STATUS "=======================================")
@@ -183,32 +179,29 @@ IF(USE_GDCM2)
       
       # 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)
-	IF (GDCM_NAME_SPACE STREQUAL "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
+      SET(GDCM2_LIBRARIES
         ${GDCM_LIBRARIES} 
 	)
 
-      # TODO : Test that GDCM was built with option "vtkgdcm"
       IF(USE_GDCM_VTK)
 	IF(USE_VTK)
 	  SET(GDCM_LIBRARIES
   	    ${GDCM_LIBRARIES}
-            vtkgdcm  
+            vtkgdcm
+			gdcm2vtk
             )
 	ENDIF(USE_VTK)
       ENDIF(USE_GDCM_VTK)
       
-    ENDIF(GDCM_FOUND)
-  ENDIF(NOT GDCM_FOUND)
+
 ENDIF(USE_GDCM2)
 
+
+
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -239,11 +232,14 @@ ENDIF(USE_DOXYGEN)
 
 
 #-----------------------------------------------------------------------------
-IF(USE_LATEX)	
+IF(USE_LATEX)
 	IF (NOT LATEX_COMPILER)
 		FIND_PACKAGE(LATEX REQUIRED)
 		MESSAGE ( STATUS "=======================================")
 		MESSAGE(STATUS "Looking for latex... - found ${LATEX_COMPILER}")
+		IF (NOT LATEX_FOUND)
+                   MESSAGE(FATAL_ERROR "LATEX_COMPILER NOT FOUND. Example:latex  (MacOS:/opt/local/bin/latex)")
+                ENDIF (NOT LATEX_FOUND)
 	ENDIF (NOT LATEX_COMPILER)
   
 ENDIF(USE_LATEX) 
@@ -274,12 +270,11 @@ 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)
 		
-		LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/stage/lib) #JCP 01/10/2009
-
+		LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/Bin/lib) 
 		#message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}")
 		IF(USE_DEBUG_LIB)
 			SET(BOOST_LIBRARIES
@@ -327,15 +322,15 @@ IF(USE_XERCES)
 		  MESSAGE(FATAL_ERROR "XERCES_DIR not found")  
 		ELSE(NOT XERCES_LIB_DIR)
 		  
-		INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/src )		
-		LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug )
+		INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include )		
+		LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/lib )
 		  
 		ENDIF(NOT XERCES_LIB_DIR)   	
 		
 		IF(USE_DEBUG_LIB)
-			set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug/xerces-c_3D)
+			set(XERCES_LIBRARIES  xerces-c_3D)
 		ELSE(USE_DEBUG_LIB)
-			set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Release/xerces-c_3)
+			set(XERCES_LIBRARIES  xerces-c_3)
 		ENDIF(USE_DEBUG_LIB)
 		
 		MARK_AS_ADVANCED(XERCES_LIB_DIR)