Doxyfile is now generated to facilitate gudhi version packaging and new module process

Doxyfile.in generates a build/src/Doxyfile that is copied by the user_version target (to avoid file generation in sources)


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ninja_cmake_warning_fix_vincent@3748 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 0a5ab637c2db102a59c994f03f0ec7fadbda3780

2 files changed, 21 insertions, 28 deletions

diff --git a/src/Doxyfile b/src/Doxyfile.in
index 020667e9..858a9299 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile.in
@@ -38,7 +38,7 @@ PROJECT_NAME           = "GUDHI"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "2.2.0"
+PROJECT_NUMBER         = "@GUDHI_VERSION@"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -780,12 +780,12 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = data/ \
-	                     example/    \
-	                     GudhUI/     \
-                             cmake/      \
-                             src/cython/ \
-                             include/gudhi_patches/
+EXCLUDE                = data/                   \
+	                     example/                \
+	                     GudhUI/                 \
+                         cmake/                  \
+                         src/cython/             \
+                         include/gudhi_patches/
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -818,9 +818,9 @@ EXCLUDE_SYMBOLS        =
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           = biblio/ \
-	example/ \
-	utilities/
+EXAMPLE_PATH           = biblio/    \
+	                     example/   \
+	                     utilities/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -840,22 +840,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = doc/Skeleton_blocker/ \
-	doc/Alpha_complex/ \
-	doc/common/ \
-        doc/Cech_complex/ \
-        doc/Contraction/ \
-	doc/Simplex_tree/ \
-	doc/Persistent_cohomology/ \
-	doc/Witness_complex/ \
-	doc/Bitmap_cubical_complex/ \
-	doc/Rips_complex/ \
-	doc/Subsampling/ \
-	doc/Spatial_searching/ \
-	doc/Tangential_complex/ \
-	doc/Bottleneck_distance/ \
-	doc/Nerve_GIC/ \
-        doc/Persistence_representations/
+IMAGE_PATH             = @GUDHI_DOXYGEN_IMAGE_PATH@
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake
index dd7eb359..d43a6fa6 100644
--- a/src/cmake/modules/GUDHI_user_version_target.cmake
+++ b/src/cmake/modules/GUDHI_user_version_target.cmake
@@ -14,6 +14,16 @@ add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
                    make_directory ${GUDHI_USER_VERSION_DIR}
                    COMMENT "user_version creation in ${GUDHI_USER_VERSION_DIR}")
 
+foreach(GUDHI_MODULE ${GUDHI_MODULES_FULL_LIST})
+  set(GUDHI_DOXYGEN_IMAGE_PATH "${GUDHI_DOXYGEN_IMAGE_PATH}    doc/${GUDHI_MODULE}/ \\  \n")
+endforeach(GUDHI_MODULE ${GUDHI_MODULES_FULL_LIST})
+
+# Generate setup.py file to cythonize Gudhi - This file must be named setup.py by convention
+configure_file(${CMAKE_SOURCE_DIR}/src/Doxyfile.in "${CMAKE_CURRENT_BINARY_DIR}/src/Doxyfile" @ONLY)
+
+add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
+        copy ${CMAKE_CURRENT_BINARY_DIR}/src/Doxyfile ${GUDHI_USER_VERSION_DIR}/Doxyfile)
+
 add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
                    copy ${CMAKE_SOURCE_DIR}/Conventions.txt ${GUDHI_USER_VERSION_DIR}/Conventions.txt)
 add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
@@ -23,8 +33,6 @@ add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
 add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
                    copy ${CMAKE_SOURCE_DIR}/src/CMakeLists.txt ${GUDHI_USER_VERSION_DIR}/CMakeLists.txt)
 add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
-                   copy ${CMAKE_SOURCE_DIR}/src/Doxyfile ${GUDHI_USER_VERSION_DIR}/Doxyfile)
-add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
                    copy ${CMAKE_SOURCE_DIR}/src/GUDHIConfigVersion.cmake.in ${GUDHI_USER_VERSION_DIR}/GUDHIConfigVersion.cmake.in)
 add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
                    copy ${CMAKE_SOURCE_DIR}/src/GUDHIConfig.cmake.in ${GUDHI_USER_VERSION_DIR}/GUDHIConfig.cmake.in)