Fix of cvs wrong conflict fixing. My fault. Sorry

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
index 29b9260f5c7cf1ca65fee8ac7bcf386c10e93f99..ca0c249ab817332cd01925b32c9172a97955de78 100644 (file)
--- a/Doc/CMakeLists.txt
+++ b/Doc/CMakeLists.txt
@@ -19,7 +19,7 @@ IF(GDCM_DOCUMENTATION)
 
   # http://www.cmake.org/pipermail/cmake/2003-April/003673.html
   # Too bad CMake doesn't support multiline ""
-  SET(GDCM_DOXYGEN_INPUT_COMMON
+  SET(GDCM_DOCUMENTATION_INPUT_COMMON
     "${GDCM_SOURCE_DIR}/src   ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt"
   )
   SET(GDCM_DOCUMENTATION_EXCLUDE_COMMON
@@ -32,7 +32,7 @@ IF(GDCM_DOCUMENTATION)
   SET(GDCM_HTML_OUTPUT
     html.developper
   )
-  SET(GDCM_DOXYGEN_INPUT
+  SET(GDCM_DOCUMENTATION_INPUT
     "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt"
   )
   SET(GDCM_DOCUMENTATION_EXCLUDE