]> Creatis software - bbtk.git/commitdiff
Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/bbtk
authorcervenansky <frederic.cervenansky@creatis.insa-lyon.fr>
Wed, 23 Jan 2013 11:29:15 +0000 (12:29 +0100)
committercervenansky <frederic.cervenansky@creatis.insa-lyon.fr>
Wed, 23 Jan 2013 11:29:15 +0000 (12:29 +0100)
Conflicts:
kernel/cmake/BBTKConfigurePackage.cmake

kernel/cmake/BBTKConfigurePackage.cmake

index 8604a812b1c2b1276d8376c4598660d0a00ee22e..27fea041200fcfe4e6bd148130024f4c70eccf67 100644 (file)
@@ -173,7 +173,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
     ${${BBTK_PACKAGE_NAME}_LIBS}
     ${GDCM_LIBRARIES}
     )
-       message(FATAL_ERROR "GDCM2 library" ${GDCM_LIBRARIES})
+
        IF(USE_GDCM)
                IF(USE_GDCM2)
                message(FATAL_ERROR "You cannot select both GDCM and GDCM2 (DICOM library readers)")