X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMake%2FUseGDCM.cmake;h=c673e9c3816cf9fc3477acf2e1170c6e8881e312;hb=6da1ced8c63b9bcf850c9b9393ca18ac025b30d2;hp=ab7d385b1d50609633e34471f14044d8b7f13b73;hpb=f233c4a2bb3cac97f90e30cb4ccad39782130732;p=gdcm.git

diff --git a/CMake/UseGDCM.cmake b/CMake/UseGDCM.cmake
index ab7d385b..c673e9c3 100644
--- a/CMake/UseGDCM.cmake
+++ b/CMake/UseGDCM.cmake
@@ -28,7 +28,7 @@ IF(NOT GDCM_USE_FILE_INCLUDED)
     "${CMAKE_MODULE_LINKER_FLAGS} ${GDCM_REQUIRED_MODULE_LINKER_FLAGS}")
 
   # Add include directories needed to use GDCM.
-  INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES( BEFORE ${GDCM_INCLUDE_DIRS})
 
   # Add link directories needed to use GDCM.
   LINK_DIRECTORIES(${GDCM_LIBRARY_DIRS})
@@ -37,14 +37,15 @@ IF(NOT GDCM_USE_FILE_INCLUDED)
   SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GDCM_CMAKE_DIR}")
 
   # Use VTK.
-  IF(NOT GDCM_NO_USE_VTK)
+  IF(GDCM_VTK)
     SET(VTK_DIR ${GDCM_VTK_DIR})
     FIND_PACKAGE(VTK)
     IF(VTK_FOUND)
       INCLUDE(${VTK_USE_FILE})
+      set(GDCM_LIBRARIES  ${GDCM_LIBRARIES}  " vtkgdcm"  )
     ELSE(VTK_FOUND)
       MESSAGE("VTK not found in GDCM_VTK_DIR=\"${GDCM_VTK_DIR}\".")
     ENDIF(VTK_FOUND)
-  ENDIF(NOT GDCM_NO_USE_VTK)
+  ENDIF(GDCM_VTK)
 
 ENDIF(NOT GDCM_USE_FILE_INCLUDED)