From b625e7eb57dfc0bbb6cdf59d2a9026552d6d12c0 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 24 Nov 2010 14:23:22 +0000 Subject: [PATCH] Fix --- kernel/cmake/BBTKConfigurePackage.cmake | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 "") -- 2.45.1