haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Doxygen test to main CMake scope 

Fixes https://gitlab.com/kicad/code/kicad/issues/4468
This commit is contained in:
Ian McInerney 2020-05-17 18:29:27 +01:00
parent 8dc6f8e82b
commit d72a778f19
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -837,6 +837,8 @@ endif()
#================================================ #================================================
# Add the documentation # Add the documentation
#================================================ #================================================
find_package( Doxygen )
add_subdirectory( Documentation ) add_subdirectory( Documentation )
# Generate config.h. # Generate config.h.

2
Documentation/CMakeLists.txt
View File

@ -21,8 +21,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
# #
find_package( Doxygen )
if( DOXYGEN_FOUND ) if( DOXYGEN_FOUND )
add_custom_target( doxygen-docs add_custom_target( doxygen-docs
${CMAKE_COMMAND} -E remove_directory Documentation/doxygen ${CMAKE_COMMAND} -E remove_directory Documentation/doxygen

1
Documentation/docset/CMakeLists.txt
View File

@ -66,6 +66,7 @@ if(DOXYGEN_FOUND AND DOXYTAG2ZEALDB AND SED)
-P ${CMAKE_MODULE_PATH}/CreateDocsetDoxyfile.cmake -P ${CMAKE_MODULE_PATH}/CreateDocsetDoxyfile.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
OUTPUT ${DOCSET_DOXYFILE} OUTPUT ${DOCSET_DOXYFILE}
DEPENDS ${CMAKE_BINARY_DIR}/kicad_build_version.h
COMMENT "Modifying doxyfile for docset creation" COMMENT "Modifying doxyfile for docset creation"
) )