From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 24 Nov 2010 14:23:22 +0000 (+0000)
Subject: Fix
X-Git-Tag: Creatools2-0-3.bbtk0-9-5.17Feb2011~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b625e7eb57dfc0bbb6cdf59d2a9026552d6d12c0;p=bbtk.git

Fix
---

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 3199388..cec4e56 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -115,22 +115,25 @@ IF(${BBTK_PACKAGE_NAME}_USE_QT)
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_QT)
 
+#----------
+
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
-  SET(USE_GDCM OFF CACHE BOOL "Use GDCM" )
+  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 "we have to choose between DICOM library readers")
+		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)
@@ -138,8 +141,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)
@@ -178,7 +187,6 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 
 
-
 #---------------------------------------------------------------------------
 
 MESSAGE(STATUS "")