From: frog <frog>
Date: Fri, 24 Sep 2004 12:12:17 +0000 (+0000)
Subject:     Fix of cvs wrong conflict fixing. My fault. Sorry
X-Git-Tag: Version0.6.bp~157
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=692a1597cb40d7627918140f310c4205eb2c0388;p=gdcm.git

Fix of cvs wrong conflict fixing. My fault. Sorry
---

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
index 29b9260f..ca0c249a 100644
--- 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