From 020f8f61db6c3dc47f6c1b5942641c80210016a7 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Fri, 23 Dec 2022 23:10:46 -0500
Subject: [PATCH] Let's try fixing the doxygen-python again
---
CMakeLists.txt | 4 ++++
doxygen/doxygen.Dockerfile | 4 +++-
pcbnew/CMakeLists.txt | 6 +++---
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47fda0ac7e..8add20b2f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
diff --git a/doxygen/doxygen.Dockerfile b/doxygen/doxygen.Dockerfile
index 17fdf755a7..87d2a49648 100644
--- a/doxygen/doxygen.Dockerfile
+++ b/doxygen/doxygen.Dockerfile
@@ -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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 91bf7dece8..fabce0a269 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -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()