diff --git a/Documentation/development/Doxyfile b/Documentation/development/Doxyfile index f005d917dd..02d6b3e831 100644 --- a/Documentation/development/Doxyfile +++ b/Documentation/development/Doxyfile @@ -46,7 +46,7 @@ PROJECT_BRIEF = # exceed 55 pixels and the maximum width should not exceed 200 pixels. # Doxygen will copy the logo to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = ../kicad_doxygen_logo.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/Documentation/kicad_doxygen_logo.png b/Documentation/kicad_doxygen_logo.png new file mode 100644 index 0000000000..84bd84ff93 Binary files /dev/null and b/Documentation/kicad_doxygen_logo.png differ diff --git a/Doxyfile b/Doxyfile index 326c6848b5..473aea1d0c 100644 --- a/Doxyfile +++ b/Doxyfile @@ -45,7 +45,7 @@ PROJECT_BRIEF = # exceed 55 pixels and the maximum width should not exceed 200 pixels. # Doxygen will copy the logo to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = Documentation/kicad_doxygen_logo.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index b690359abe..e96e2c7d55 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -533,7 +533,10 @@ if( DOXYGEN_FOUND ) # Create doxygen-python html add_custom_target( doxygen-python ${CMAKE_COMMAND} -E remove_directory doxygen-python - COMMAND ${CMAKE_COMMAND} -E env PYTHON_SOURCES_TO_DOC=${DOXYGEN_PYTHON_SOURCES_STR} ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_python + COMMAND ${CMAKE_COMMAND} -E env + PYTHON_SOURCES_TO_DOC=${DOXYGEN_PYTHON_SOURCES_STR} + CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_python WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS Doxyfile_python DEPENDS xml-to-docstrings diff --git a/pcbnew/Doxyfile_python b/pcbnew/Doxyfile_python index c062927213..a2ce2f7b68 100644 --- a/pcbnew/Doxyfile_python +++ b/pcbnew/Doxyfile_python @@ -51,7 +51,7 @@ PROJECT_BRIEF = # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # to the output directory. -PROJECT_LOGO = +PROJECT_LOGO = $(CMAKE_SOURCE_DIR)/Documentation/kicad_doxygen_logo.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is