X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=765363528bd5ad1e33bcedf0063459e35b719505;hb=92777ab6b0fdbab3ca7d2ffda2e87d6270869ded;hp=f72ccd4531575254779d24898b5c6d6e4ded56fe;hpb=ed9d32f344e2ffa223081390b63f064cf1e42de0;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index f72ccd4..7653635 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -1,3 +1,14 @@
+# ==================================
+#           W A R N I N G !
+# ==================================
+#
+# This file is dupplicated as BBTKConfigurePackage2.cmake
+#
+# Only ONE commented out line, in BBTKConfigurePackage2.cmake differs
+# :-(
+# In case of modification, mind to modify BBTKConfigurePackage2.cmake as well!
+#
+
 
 MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
@@ -115,15 +126,25 @@ 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 ON 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 "You cannot select both GDCM and GDCM2 (DICOM library readers)")
+		ENDIF(USE_GDCM2)
+	ENDIF(USE_GDCM)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
 
+#----------
+
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
   SET(USE_GDCM2 ON CACHE BOOL "Use GDCM2" FORCE)
   SET(USE_GDCM2_VTK ON CACHE BOOL "Use GDCM2_VTK" FORCE)
@@ -131,8 +152,14 @@ IF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
     ${${BBTK_PACKAGE_NAME}_LIBS}
     ${GDCM2_LIBRARIES}
     )
+	IF(USE_GDCM2)
+		IF(USE_GDCM)
+		message(FATAL_ERROR "You cannot select both GDCM and GDCM2 (DICOM library readers)")
+		ENDIF(USE_GDCM)
+	ENDIF(USE_GDCM2)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM2)
 
+#----------
 
 IF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
   SET(USE_GSMIS ON CACHE BOOL "Use GSMIS" FORCE)
@@ -181,11 +208,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 "=======================================")