X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=21d8599efa703b2993b885ca72c00b90cb05da26;hb=cf155931d4fded21cd2aaaeb0f3ead82067d2bef;hp=619be1a909a1f2a93aa30c77fa7e95d4abc34d50;hpb=ead983d5eeec329e05bfadcaad90001cc7197408;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 619be1a..21d8599 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -104,6 +104,7 @@ IF(USE_ITK)
 ENDIF(USE_ITK)
 #-----------------------------------------------------------------------------
 
+
 #-----------------------------------------------------------------------------
 #OPTION(USE_GDCM "Build GDCM-based black boxes" OFF)
 IF(USE_GDCM)
@@ -116,9 +117,16 @@ IF(USE_GDCM)
 
     MESSAGE ( STATUS "Looking for GDCM... found")
     MESSAGE ( STATUS "* Dir       = ${GDCM_DIR}")
-    MESSAGE ( STATUS "* Version   = ${GDCM_VERSION_MAJOR}.${GDCM_VERSION_MINOR}.${GDCM_VERSION_PATCH}")
+    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 (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")
+
+    MARK_AS_ADVANCED(GDCM_DIR)
     
     SET(BBTK_GDCM_LIBRARIES
 # TO DO : USE GDCM LINK LIBRARIES !!!
@@ -127,6 +135,7 @@ IF(USE_GDCM)
 #gdcm  gdcmjpeg8  gdcmjpeg12  gdcmjpeg16
       )
 
+	  
 #     IF(USE_VTK )
 #         SET(BBTK_GDCM_LIBRARIES
 #  	           ${BBTK_GDCM_LIBRARIES}
@@ -136,6 +145,7 @@ IF(USE_GDCM)
 
   ENDIF(GDCM_FOUND)
 ENDIF(USE_GDCM)
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -152,11 +162,11 @@ ENDIF(USE_WXWIDGETS)
 IF(USE_DOXYGEN) 
   FIND_PACKAGE(Doxygen REQUIRED)
 #  MESSAGE(STATUS "Looking for doxygen... - found ${DOXYGEN}")
-  #  IF(DOXYGEN)
-#    
-#  ELSE(DOXYGEN)
-#    MESSAGE(FATAL_ERROR "Doxygen not found. Required to build the doxygen documentation")
-#  ENDIF(DOXYGEN)
+  IF(DOXYGEN)
+    
+  ELSE(DOXYGEN)
+    MESSAGE(FATAL_ERROR "Doxygen not found. Required to build the doxygen documentation")
+  ENDIF(DOXYGEN)
 ENDIF(USE_DOXYGEN)
 #-----------------------------------------------------------------------------