X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Doc%2FCMakeLists.txt;h=ca0c249ab817332cd01925b32c9172a97955de78;hb=692a1597cb40d7627918140f310c4205eb2c0388;hp=25076fcdb048a9d346873c5ebe9aa8a24d9a8231;hpb=63f579ada04b47069e977c900e89b433e1aae95b;p=gdcm.git

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
index 25076fcd..ca0c249a 100644
--- a/Doc/CMakeLists.txt
+++ b/Doc/CMakeLists.txt
@@ -12,20 +12,17 @@ SET(TARGET_DIR
 #EXTRA_DIST = \
 #  DoxyfileDeveloppers  \
 #  DoxyfileUsers        \
-#  DoxyDevelInstal.txt  \
-#  DoxyIntroduction.txt \
 #  DoxyPython.txt       \
-#  DoxyInstallation.txt \
 #  DoxyMainPage.txt
 
-IF(GDCM_DOXYGEN)
+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
-    "${GDCM_SOURCE_DIR}/src   ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt   ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt  ${GDCM_SOURCE_DIR}/Doc/DoxyInstallation.txt  ${GDCM_SOURCE_DIR}/Doc/DoxyIntroduction.txt"
+  SET(GDCM_DOCUMENTATION_INPUT_COMMON
+    "${GDCM_SOURCE_DIR}/src   ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt"
   )
-  SET(GDCM_DOXYGEN_EXCLUDE_COMMON
+  SET(GDCM_DOCUMENTATION_EXCLUDE_COMMON
   )
 
   #Should rewrote this thing with FOREACH:
@@ -35,11 +32,11 @@ IF(GDCM_DOXYGEN)
   SET(GDCM_HTML_OUTPUT
     html.developper
   )
-  SET(GDCM_DOXYGEN_INPUT
-    "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyDevelInstal.txt"
+  SET(GDCM_DOCUMENTATION_INPUT
+    "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt"
   )
-  SET(GDCM_DOXYGEN_EXCLUDE
-    "${GDCM_DOXYGEN_EXCLUDE_COMMON}  ${GDCM_SOURCE_DIR@/src/iddcmjpeg.h     ${GDCM_SOURCE_DIR@/src/src/gdcmJpeg.cxx"
+  SET(GDCM_DOCUMENTATION_EXCLUDE
+    "${GDCM_DOCUMENTATION_EXCLUDE_COMMON}  ${GDCM_SOURCE_DIR@/src/iddcmjpeg.h     ${GDCM_SOURCE_DIR@/src/src/gdcmJpeg.cxx"
   )
   CONFIGURE_FILE(
       ${GDCM_SOURCE_DIR}/Doc/doxygen.config.in
@@ -58,11 +55,11 @@ IF(GDCM_DOXYGEN)
   SET(GDCM_HTML_OUTPUT
     html.user
   )
-  SET(GDCM_DOXYGEN_INPUT
-    "${GDCM_DOXYGEN_INPUT_COMMON}"
+  SET(GDCM_DOCUMENTATION_INPUT
+    "${GDCM_DOCUMENTATION_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPageUser.txt"
   )
-  SET(GDCM_DOXYGEN_EXCLUDE
-    "${GDCM_DOXYGEN_EXCLUDE_COMMON}"
+  SET(GDCM_DOCUMENTATION_EXCLUDE
+    "${GDCM_DOCUMENTATION_EXCLUDE_COMMON}"
   )
   CONFIGURE_FILE(
       ${GDCM_SOURCE_DIR}/Doc/doxygen.config.in
@@ -72,7 +69,7 @@ IF(GDCM_DOXYGEN)
 
   ADD_CUSTOM_TARGET(doc-user
    ALL
-   ${DOXYGEN}
+   ${DOCUMENTATION}
    ${GDCM_BINARY_DIR}/Doc/DoxyfileUsers)
 
 
@@ -81,12 +78,12 @@ IF(GDCM_DOXYGEN)
   INSTALL_FILES(${HTML_DIR} "\\.html$")
   #INSTALL_FILES(${HTML_DIR} "\\.pl$")
   #INSTALL_FILES(${HTML_DIR} "\\.stop$")
-ENDIF(GDCM_DOXYGEN)
+ENDIF(GDCM_DOCUMENTATION)
 
 #-----------------------------------------------------------------------------
 # m4 that hasn't been translated
 
 #dist-hook:
-#	rm -rf $(distdir)/html.developper
+# rm -rf $(distdir)/html.developper
 
 #.PHONY : html.developper latex man