diff options
author | Vincent Rouvreau <VincentRouvreau@users.noreply.github.com> | 2019-03-11 15:02:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-11 15:02:03 +0100 |
commit | 6e18a142ffff18d0d6c467b215042c6010fb8639 (patch) | |
tree | 3ad8d537b1a29769f85e38b2d1f66732b6058dc0 | |
parent | aa9eef873b94579268374076b9477b2d189f440d (diff) | |
parent | 0d8fc786ea2cb6f70bf940837837d3845d123ec6 (diff) |
Merge pull request #36 from VincentRouvreau/master
Fix README.md file name renamed for Doxygen generation
-rw-r--r-- | .travis.yml | 3 | ||||
-rw-r--r-- | src/Doxyfile.in | 3 | ||||
-rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 90326e5d..b874123c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ env: # Only utilities and associated tests - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test' # Only doxygen documentation -# make user_version fails because it tries to copy a file that name changed... -# - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' # Only Python, associated tests and sphinx documentation - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' cache: diff --git a/src/Doxyfile.in b/src/Doxyfile.in index 858a9299..1c293d1c 100644 --- a/src/Doxyfile.in +++ b/src/Doxyfile.in @@ -785,7 +785,8 @@ EXCLUDE = data/ \ GudhUI/ \ cmake/ \ src/cython/ \ - include/gudhi_patches/ + include/gudhi_patches/ \ + README.md # 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 diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake index d43a6fa6..2ed48c48 100644 --- a/src/cmake/modules/GUDHI_user_version_target.cmake +++ b/src/cmake/modules/GUDHI_user_version_target.cmake @@ -27,7 +27,7 @@ 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}/Conventions.txt ${GUDHI_USER_VERSION_DIR}/Conventions.txt) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy ${CMAKE_SOURCE_DIR}/README ${GUDHI_USER_VERSION_DIR}/README) + copy ${CMAKE_SOURCE_DIR}/README.md ${GUDHI_USER_VERSION_DIR}/README.md) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/COPYING ${GUDHI_USER_VERSION_DIR}/COPYING) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E |