Let's try fixing the doxygen-python again

This commit is contained in:
Marek Roszko 2022-12-23 23:10:46 -05:00
parent bd77fb87b7
commit 020f8f61db
3 changed files with 10 additions and 4 deletions

View File

@ -26,6 +26,10 @@ cmake_minimum_required( VERSION 3.21 FATAL_ERROR )
# Generate DEPFILES without transforming relative paths
cmake_policy( SET CMP0116 OLD )
# Needed to allow the doxygen-python process that depends on swig generation running twice to occur
# The current structure requires the add_custom_command to get called twice, the NEW behavior deduplicates it
cmake_policy( SET CMP0113 OLD )
# Default to CMAKE_BUILD_TYPE = Release unless overridden on command line
# http://www.cmake.org/pipermail/cmake/2008-September/023808.html
if( DEFINED CMAKE_BUILD_TYPE )

View File

@ -14,8 +14,10 @@ RUN cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DKICAD_SCRIPTING_WXPYTHON=ON \
-DKICAD_SPICE=ON
RUN make doxygen-docs
RUN make doxygen-python
FROM scratch as output-image
COPY --from=build-doxygen-env /src/doxygen/out/html /doxygen-docs_html
COPY --from=build-doxygen-env /src/doxygen/out/html /doxygen-docs_html
COPY --from=build-doxygen-env /src/build/pcbnew/doxygen-python/html /doxygen-python_html

View File

@ -505,7 +505,7 @@ if( DOXYGEN_FOUND )
DEPENDS Doxyfile_xml
COMMENT "building doxygen docs into directory doxygen-python/html"
)
add_dependencies( doxygen-python-xml version_header )
# create .i files from XML doxygen parsing, docstrings.i will include all of them
@ -518,7 +518,7 @@ if( DOXYGEN_FOUND )
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS pcbnew.py
)
add_dependencies( xml-to-docstrings doxygen-python-xml )
# The sources to give to the Python Doxygen target
@ -542,7 +542,7 @@ if( DOXYGEN_FOUND )
DEPENDS ${DOXYGEN_PYTHON_SOURCES}
COMMENT "building doxygen docs into directory doxygen-python/html"
)
add_dependencies( doxygen-python version_header xml-to-docstrings )
endif()