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

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
index ca0c249a..eed65ebd 100644
--- a/Doc/CMakeLists.txt
+++ b/Doc/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Build the documentation
 
 SET(HTML_DIR
-  ${GDCM_DATA_DIR}/html
+  ${GDCM_INSTALL_DATA_DIR}/html
 )
 
 SET(TARGET_DIR
@@ -20,12 +20,26 @@ IF(GDCM_DOCUMENTATION)
   # http://www.cmake.org/pipermail/cmake/2003-April/003673.html
   # Too bad CMake doesn't support multiline ""
   SET(GDCM_DOCUMENTATION_INPUT_COMMON
-    "${GDCM_SOURCE_DIR}/src   ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt"
+    "${GDCM_SOURCE_DIR}/src ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt ${GDCM_SOURCE_DIR}/Doc/DoxyVtkGdmReaderExamples.txt"
   )
   SET(GDCM_DOCUMENTATION_EXCLUDE_COMMON
+    "${GDCM_SOURCE_DIR}/src/gdcmJpeg.cxx ${GDCM_SOURCE_DIR}/src/jdatasrc.cxx ${GDCM_SOURCE_DIR}/src/jdatadst.cxx"
   )
-
-  #Should rewrote this thing with FOREACH:
+  
+  IF(GDCM_VTK)
+     SET(GDCM_DOCUMENTATION_INPUT_COMMON
+         "${GDCM_DOCUMENTATION_INPUT_COMMON} ${GDCM_SOURCE_DIR}/vtk")
+  ENDIF(GDCM_VTK)
+
+  IF(DOT)
+     GET_FILENAME_COMPONENT(GDCM_DOCUMENTATION_DOT_PATH ${DOT} PATH)
+     SET(GDCM_DOCUMENTATION_HAVE_DOT "YES")
+  ELSE(DOT)
+     SET(GDCM_DOCUMENTATION_DOT_PATH "")
+     SET(GDCM_DOCUMENTATION_HAVE_DOT "NO")
+  ENDIF(DOT)
+
+  #Should rewrite this thing with FOREACH:
   #-----------------------------------------------------------------------------
   # Build the documentation for developpers
 
@@ -33,10 +47,10 @@ IF(GDCM_DOCUMENTATION)
     html.developper
   )
   SET(GDCM_DOCUMENTATION_INPUT
-    "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt"
+    "${GDCM_DOCUMENTATION_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt"
   )
   SET(GDCM_DOCUMENTATION_EXCLUDE
-    "${GDCM_DOCUMENTATION_EXCLUDE_COMMON}  ${GDCM_SOURCE_DIR@/src/iddcmjpeg.h     ${GDCM_SOURCE_DIR@/src/src/gdcmJpeg.cxx"
+    "${GDCM_DOCUMENTATION_EXCLUDE_COMMON}"
   )
   CONFIGURE_FILE(
       ${GDCM_SOURCE_DIR}/Doc/doxygen.config.in
@@ -59,7 +73,7 @@ IF(GDCM_DOCUMENTATION)
     "${GDCM_DOCUMENTATION_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPageUser.txt"
   )
   SET(GDCM_DOCUMENTATION_EXCLUDE
-    "${GDCM_DOCUMENTATION_EXCLUDE_COMMON}"
+    "${GDCM_DOCUMENTATION_EXCLUDE_COMMON} ${GDCM_SOURCE_DIR}/src/gdcmTS.h ${GDCM_SOURCE_DIR}/src/gdcmTS.cxx"
   )
   CONFIGURE_FILE(
       ${GDCM_SOURCE_DIR}/Doc/doxygen.config.in
@@ -69,7 +83,7 @@ IF(GDCM_DOCUMENTATION)
 
   ADD_CUSTOM_TARGET(doc-user
    ALL
-   ${DOCUMENTATION}
+   ${DOXYGEN}
    ${GDCM_BINARY_DIR}/Doc/DoxyfileUsers)