From e28397015e008be0b584e28ada833223ea8bfa35 Mon Sep 17 00:00:00 2001 From: legrand Date: Thu, 11 Oct 2007 15:20:37 +0000 Subject: [PATCH] changed doc config git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@712 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-peo/CMakeLists.txt | 2 +- .../paradiseo-peo/doc/peo.doxyfile.cmake | 2 +- .../tutorial/Lesson1/CMakeLists.txt | 21 +++++++++++++++- .../paradiseo-peo/tutorial/Lesson1/doclsn.h | 2 +- .../tutorial/examples/tsp/CMakeLists.txt | 25 ++++++++++++++++++- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/tags/paradiseo-ix86-1.0/paradiseo-peo/CMakeLists.txt b/tags/paradiseo-ix86-1.0/paradiseo-peo/CMakeLists.txt index 87a8436f2..a0944275b 100644 --- a/tags/paradiseo-ix86-1.0/paradiseo-peo/CMakeLists.txt +++ b/tags/paradiseo-ix86-1.0/paradiseo-peo/CMakeLists.txt @@ -40,7 +40,7 @@ INCLUDE(peo-conf.cmake OPTIONAL) PROJECT(ParadisEO-PEO) SET(PACKAGE_BUGREPORT "paradiseo-help@lists.gforge.inria.fr" CACHE STRING "Package bug report" FORCE) -SET(PACKAGE_NAME "ParadisEO-PEO Moving Objects" CACHE STRING "Package name" FORCE) +SET(PACKAGE_NAME "ParadisEO-PEO: Parallel and Distributed Evolving Objects" CACHE STRING "Package name" FORCE) SET(PACKAGE_STRING "ParadisEO-PEO 1.0" CACHE STRING "Package string full name" FORCE) SET(PACKAGE_VERSION "1.0" CACHE STRING "Package version" FORCE) SET(GLOBAL_VERSION "1.0" CACHE STRING "Global version" FORCE) diff --git a/tags/paradiseo-ix86-1.0/paradiseo-peo/doc/peo.doxyfile.cmake b/tags/paradiseo-ix86-1.0/paradiseo-peo/doc/peo.doxyfile.cmake index 62d813fc6..3bf85b8d4 100644 --- a/tags/paradiseo-ix86-1.0/paradiseo-peo/doc/peo.doxyfile.cmake +++ b/tags/paradiseo-ix86-1.0/paradiseo-peo/doc/peo.doxyfile.cmake @@ -82,7 +82,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = @CMAKE_SOURCE_DIR@/src @CMAKE_SOURCE_DIR@/doc @CMAKE_SOURCE_DIR@/tutorial +INPUT = @CMAKE_SOURCE_DIR@/src @CMAKE_SOURCE_DIR@/doc FILE_PATTERNS = *.cpp \ *.h \ NEWS \ diff --git a/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt b/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt index 8f9cc5115..e9cd91074 100644 --- a/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt +++ b/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt @@ -1,6 +1,6 @@ ###################################################################################### -### 0) Set the compiler and define targets to easily run the lessons +### 0) Set the compiler,define targets to easily run the lessons and manage doc ###################################################################################### SET (CMAKE_CXX_COMPILER mpicxx) @@ -28,6 +28,25 @@ ADD_CUSTOM_COMMAND( ARGS -E copy_if_different ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Lesson1/ParadisEO-PEO_Lesson1.pdf ${ParadisEO-PEO_BINARY_DIR}/tutorial/Lesson1) + +IF (DOXYGEN_FOUND) + #SET(DOC_DIR ${CMAKE_BINARY_DIR}/doc CACHE PATH "PEO TSP documentation directory") + SET(PEO_LESSON1_DOC_CONFIG_FILE "paradiseo-peo-lsn1.doxyfile" CACHE PATH "PEO tutorial lesson1 documentation configuration file") + # define the doc target + IF (DOXYGEN_EXECUTABLE) + ADD_CUSTOM_TARGET(doc + COMMAND ${DOXYGEN_EXECUTABLE} ${PEO_LESSON1_DOC_CONFIG_FILE} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + ENDIF (DOXYGEN_EXECUTABLE) + + # configure doxyfile file + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/tutorial/Lesson1/${PEO_LESSON1_DOC_CONFIG_FILE}.cmake" + "${CMAKE_BINARY_DIR}/tutorial/Lesson1/${PEO_LESSON1_DOC_CONFIG_FILE}") + +ELSE (DOXYGEN_FOUND) + MESSAGE(STATUS "Unable to generate the documentation, Doxygen package not found") +ENDIF (DOXYGEN_FOUND) ###################################################################################### diff --git a/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/doclsn.h b/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/doclsn.h index 544edc583..b2d756dd6 100644 --- a/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/doclsn.h +++ b/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/Lesson1/doclsn.h @@ -78,7 +78,7 @@ //!
            eoContinue< EOT >& __cont, //!
            peoPopEval< EOT >& __pop_eval, //!
            eoSelect< EOT >& __select, -//!
            peoTransform< EOT >& __trans, +//!
            peoTransform& __trans, //!
            eoReplacement< EOT >& __replace //!
     ); //! diff --git a/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/examples/tsp/CMakeLists.txt b/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/examples/tsp/CMakeLists.txt index b22a7fe63..bbc9b297a 100644 --- a/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/examples/tsp/CMakeLists.txt +++ b/tags/paradiseo-ix86-1.0/paradiseo-peo/tutorial/examples/tsp/CMakeLists.txt @@ -1,6 +1,6 @@ ###################################################################################### -### 0) Copy the "benchs" directory in the build directory to easily run the lessons +### 0) Copy the "benchs" directory and manage the documentation ###################################################################################### ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp/benchs) @@ -12,6 +12,29 @@ ADD_CUSTOM_COMMAND( ${ParadisEO-PEO_SOURCE_DIR}/tutorial/examples/tsp/benchs ${ParadisEO-PEO_BINARY_DIR}/tutorial/examples/tsp/benchs) +IF (DOXYGEN_FOUND) + #SET(DOC_DIR ${CMAKE_BINARY_DIR}/doc CACHE PATH "PEO TSP documentation directory") + SET(PEO_TSP_DOC_CONFIG_FILE "paradiseo-peo-lsn-shared.doxyfile" CACHE PATH "PEO TSP documentation configuration file") + # define the doc target + IF (DOXYGEN_EXECUTABLE) + ADD_CUSTOM_TARGET(doc + COMMAND ${DOXYGEN_EXECUTABLE} ${PEO_TSP_DOC_CONFIG_FILE} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + ENDIF (DOXYGEN_EXECUTABLE) + + # configure doxyfile file + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/tutorial/examples/tsp/${PEO_TSP_DOC_CONFIG_FILE}.cmake" + "${CMAKE_BINARY_DIR}/tutorial/examples/tsp/${PEO_TSP_DOC_CONFIG_FILE}") + +ELSE (DOXYGEN_FOUND) + MESSAGE(STATUS "Unable to generate the documentation, Doxygen package not found") +ENDIF (DOXYGEN_FOUND) + +########################################################################################## + + + ######################################################################################