X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=e781d61838ad78bdbe6e77d2ab1f1d0a5fafc4f5;hb=be8eea137173038001d4f8450ff6775c178e3b5e;hp=1763d8337f40c917ebee2e41b71f7dc99df57019;hpb=b60f4996d8155665b79e20f85999f287bf1d73d3;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 1763d83..e781d61 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -13,11 +13,16 @@ IF(USE_VTK)
     INCLUDE(${VTK_USE_FILE})
     ADD_DEF( _USE_VTK_ )
     SET(BBTK_VTK_LIBRARIES
-      #     vtkCommon 
-      vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon vtkWidgets
-      vtkVolumeRendering
-      # LG : removed vtkIO because conflict with itktiff lib in ITKIO 
-      ) 
+      vtkCommon     # Mandatory
+      vtkFiltering  # vtkImageData
+      vtkRendering  # vtkProp3D
+      vtkWidgets    # vtkImagePlaneWidget
+      vtkIO         # vtkMetaImageReader/Writer
+      vtkImaging    # filters such as vtkImageAnisotropicDiffusion3D
+      vtkGraphics   # vtkContourFilter, sources
+      vtkVolumeRendering # Mappers 
+#      vtkGenericFiltering
+     ) 
     MARK_AS_ADVANCED(VTK_DIR)
   ELSE(VTK_FOUND)
      message(FATAL_ERROR "VTK_DIR not found")
@@ -117,9 +122,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 !!!
@@ -155,11 +167,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)
 #-----------------------------------------------------------------------------