Convert bbtk from GDCM to GDCM2 (cmakefiles and cxx files).

[bbtk.git] / kernel / cmake / BBTKConfigurePackage.cmake

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index f72ccd4531575254779d24898b5c6d6e4ded56fe..319938879cac4b2e6c7fda85aeb62cdb352237e6 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -116,12 +116,19 @@ IF(${BBTK_PACKAGE_NAME}_USE_QT)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_QT)
 
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
-  SET(USE_GDCM ON CACHE BOOL "Use GDCM" FORCE)
+  SET(USE_GDCM OFF CACHE BOOL "Use GDCM" )
+  SET(USE_GDCM2 OFF CACHE BOOL "Use GDCM2" )
   SET(USE_GDCM_VTK ON CACHE BOOL "Use GDCM_VTK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
     ${GDCM_LIBRARIES}
     )
+       
+       IF(USE_GDCM)
+               IF(USE_GDCM2)
+               message(FATAL_ERROR "we have to choose between DICOM library readers")
+               ENDIF(USE_GDCM2)
+       ENDIF(USE_GDCM)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
 
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
@@ -171,6 +178,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 
 
+
 #---------------------------------------------------------------------------
 
 MESSAGE(STATUS "")
@@ -181,11 +189,11 @@ MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")
 
 #---------------------------------------------------------------------------
-# Recurse into subdirs
-SUBDIRS(src)
-SUBDIRS(doc)
-SUBDIRS(bbs)
-SUBDIRS(data)
+# Recurse into ADD_SUBDIRECTORY
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(doc)
+ADD_SUBDIRECTORY(bbs)
+ADD_SUBDIRECTORY(data)
 #---------------------------------------------------------------------------
 
 MESSAGE(STATUS "=======================================")