Changes for the generation of the documentation in creaNewProject

diff --git a/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake b/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake
index 2446671..1d5a0a9 100644 (file)
--- a/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake
+++ b/appli/creaNewProject/NewProject/cmake/UserBuildDoxygenDoc.cmake
@@ -9,11 +9,11 @@ MACRO(USER_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
   SET(DOXYGEN_PROJECT_NAME "${NAME}")
 
   # Inputs
-  #STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
+  STRING(REGEX REPLACE ";" " " DOXYGEN_INPUT "${INPUT}")
 
   # Output dirs
   SET(DOXYGEN_HTML_OUTPUT ".")
-  SET(DOXYGEN_OUTPUT "${${PROJECT_NAME}_DOXYGEN_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}") 
+  SET(DOXYGEN_OUTPUT "${${PROJECT_NAME}_DOXYGEN_BUILD_PATH}") 
   STRING(REGEX REPLACE " " "~" DOXYGEN_OUTPUT "${DOXYGEN_OUTPUT}")
   
  

diff --git a/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake b/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake
index 1cba436..696696d 100644 (file)
--- a/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake
+++ b/appli/creaNewProject/NewProject/cmake/UserBuildHtmlDocFromLatex.cmake
@@ -6,9 +6,9 @@ MACRO(USER_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH)
   # Construct absolute build path
   SET(BUILD_PATH ${${PROJECT_NAME}_DOC_BUILD_PATH}/${OUTPUT_REL_PATH})
   #------------------------------------------------------------------------- 
-  IF(WIN32)
-               SET(TTH_EXECUTABLE "${TTH_EXECUTABLE}/tth.exe")
-       ENDIF(WIN32)
+  #IF(WIN32)
+       #       SET(TTH_EXECUTABLE "${TTH_EXECUTABLE}/tth.exe")
+       #ENDIF(WIN32)
        
        #message("MACRO(USER_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH) TTH_EXECUTABLE ${TTH_EXECUTABLE}")
   ADD_CUSTOM_COMMAND(

diff --git a/appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt b/appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt
index 9fab474..f48d51f 100644 (file)
--- a/appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt
+++ b/appli/creaNewProject/NewProject/doc/UserDoxygen/CMakeLists.txt
@@ -12,14 +12,17 @@ CONFIGURE_FILE(
   ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
   @ONLY IMMEDIATE
   )
+  
+FILE(GLOB_RECURSE ALLSOURCE ${PROJECT_SOURCE_DIR}/lib/*.cxx ${PROJECT_SOURCE_DIR}/lib/*.h)
+FILE(GLOB_RECURSE ALLAPPLI ${PROJECT_SOURCE_DIR}/appli/*.cxx ${PROJECT_SOURCE_DIR}/appli/*.h)
 
 SET(INPUT 
   ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  ${PROJECT_SOURCE_DIR}/lib
-  ${PROJECT_SOURCE_DIR}/appli
+  ${ALLSOURCE}
+  ${ALLAPPLI}
   )
-
 INCLUDE(../../cmake/UserBuildDoxygenDoc.cmake)
+
 USER_BUILD_DOXYGEN_DOC(
   "${PROJECT_NAME}" 
   "${INPUT}" 

diff --git a/appli/creaNewProject/NewProject/doc/config.tex b/appli/creaNewProject/NewProject/doc/config.tex
index e94eb1f..d07c921 100644 (file)
--- a/appli/creaNewProject/NewProject/doc/config.tex
+++ b/appli/creaNewProject/NewProject/doc/config.tex
@@ -1,3 +1,4 @@
+\usepackage{ifpdf}
 % ==========================================
 \newif\ifpdf 
 \ifx\pdfoutput\undefined \pdffalse % we are not running PDFLaTeX