diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-08-09 12:29:14 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-08-09 12:29:14 +0000 |
| commit | 19845ecfdecf457005ee4a9a6b6d5b5321e0c6c1 (patch) | |
| tree | ab61469a34bd7e3b0c904c5efe2f3eb1e023a85d /src/cmake/modules/GUDHI_doxygen_target.cmake | |
| parent | e9ccf83a5a82bfcbeee26f55238cda514ad50650 (diff) | |
| parent | 38be2a768f860c6885ef1287ade1742961b1fe05 (diff) | |
Merge ninja_cmake_warning_fix_vincent branch
Fix issues #4, 6, 13, 14, 15, 21
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3760 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 32b5cc470f6095a64f102e0e641e13d2fc9d63ff
Diffstat (limited to 'src/cmake/modules/GUDHI_doxygen_target.cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_doxygen_target.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cmake/modules/GUDHI_doxygen_target.cmake b/src/cmake/modules/GUDHI_doxygen_target.cmake index f3e2d9f5..9e10e566 100644 --- a/src/cmake/modules/GUDHI_doxygen_target.cmake +++ b/src/cmake/modules/GUDHI_doxygen_target.cmake @@ -3,14 +3,17 @@ find_package(Doxygen) if(DOXYGEN_FOUND) # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) - #starting from cmake 3.9 the usage of DOXYGEN_EXECUTABLE is deprecated + # starting from cmake 3.9 the usage of DOXYGEN_EXECUTABLE is deprecated if(TARGET Doxygen::doxygen) get_property(DOXYGEN_EXECUTABLE TARGET Doxygen::doxygen PROPERTY IMPORTED_LOCATION) endif() add_custom_target(doxygen ${DOXYGEN_EXECUTABLE} ${GUDHI_USER_VERSION_DIR}/Doxyfile WORKING_DIRECTORY ${GUDHI_USER_VERSION_DIR} - DEPENDS ${GUDHI_USER_VERSION_DIR}/Doxyfile ${GUDHI_DOXYGEN_DEPENDENCY} COMMENT "Generating API documentation with Doxygen in ${GUDHI_USER_VERSION_DIR}/doc/html/" VERBATIM) + if(TARGET user_version) + # In dev version, doxygen target depends on user_version target. Not existing in user version + add_dependencies(doxygen user_version) + endif() endif(DOXYGEN_FOUND) |