From 88d860fb1a078ca1adddae73811054bef93b6c94 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Sat, 21 Oct 2023 16:15:37 +0200 Subject: [PATCH 1/2] Attempt to solve intermittent download problems when installing doxygen --- .github/workflows/vcmatrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vcmatrix.yml b/.github/workflows/vcmatrix.yml index 88b6bb5ce..80a8eb5a6 100644 --- a/.github/workflows/vcmatrix.yml +++ b/.github/workflows/vcmatrix.yml @@ -56,7 +56,7 @@ jobs: if: runner.os=='Windows' - run: choco install -y -r --no-progress eigen --version=3.4.0 ${{ matrix.cfg.choco_flags }} if: runner.os=='Windows' - - run: choco install -y -r --no-progress doxygen.install --version=1.9.6 & choco install -y -r --no-progress graphviz & pip install --upgrade wheel setuptools sphinx breathe sphinx-issues sphinx-tabs sphinx_rtd_theme sphinx-reredirects + - run: wget https://packages.ensta-bretagne.fr/choco/doxygen.install.1.9.6.nupkg --no-check-certificate -nv & choco upgrade -y -r --no-progress -s . doxygen.install --version=1.9.6 & del /f /q doxygen.install.1.9.6.nupkg & choco install -y -r --no-progress graphviz & pip install --upgrade wheel setuptools sphinx breathe sphinx-issues sphinx-tabs sphinx_rtd_theme sphinx-reredirects if: runner.os=='Windows' - run: | wget https://github.com/lebarsfa/ibex-lib/releases/download/ibex-2.8.9.20231007/ibex.2.8.9.20231007.nupkg --no-check-certificate -nv From 75b652ecc87ad38eb9948ec2658f53c6de292779 Mon Sep 17 00:00:00 2001 From: lebarsfa Date: Sun, 22 Oct 2023 16:34:56 +0200 Subject: [PATCH 2/2] Attempt to force the selection of a compatible version of doxygen --- doc/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 19e5f7112..58ba02ac2 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -10,8 +10,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mathjax_stmaryrd.js # Technical API documentation (Doxygen) if(WITH_PYTHON) - - find_package(Doxygen) + + find_package(Doxygen 1.0.0...1.9.6) if(NOT DOXYGEN_FOUND) @@ -19,6 +19,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mathjax_stmaryrd.js else() + if(NOT DOXYGEN_DIR) + message(STATUS "Doxygen ${DOXYGEN_VERSION} found.") + else() + message(STATUS "Doxygen ${DOXYGEN_VERSION} found in ${DOXYGEN_DIR}.") + endif() + # Includes CMake commands in config file: configure_file(api/Doxyfile.in api/Doxyfile)