From 1934f025eb1dac52ce235a65e70384a991e9257b Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Tue, 19 May 2026 10:55:35 +0200 Subject: [PATCH 1/4] Add conditional Doxygen documentation build in conanfile.py --- conanfile.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index c5a3b74..4e4797d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,5 @@ import os +import shutil from conan import ConanFile from conan.tools.cmake import CMake, cmake_layout @@ -61,7 +62,8 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() - cmake.build(target="doc") + if shutil.which("doxygen"): + cmake.build(target="doc") if self._is_tests_enabled(): env = VirtualRunEnv(self).environment() env.define("CTEST_OUTPUT_ON_FAILURE", "ON") @@ -72,7 +74,8 @@ def build(self): def package(self): cmake = CMake(self) cmake.install() - cmake.build(target="install-doc") + if shutil.which("doxygen"): + cmake.build(target="install-doc") def package_info(self): self.cpp_info.libs = [ "cosimc" ] From 5b97fab29dc4b43822de4463d9a591e3dfeb89f5 Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Tue, 19 May 2026 12:28:04 +0200 Subject: [PATCH 2/4] Add Doxygen as a tool requirement in conanfile.py --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 4e4797d..57906d7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,6 +43,7 @@ def configure(self): # Dependencies/requirements tool_requires = ( "cmake/[>=4.0]", + "doxygen/1.17.0", ) requires = ( "libcosim/0.11.2@osp/stable", @@ -62,8 +63,8 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() - if shutil.which("doxygen"): - cmake.build(target="doc") + cmake.build(target="doc") + if self._is_tests_enabled(): env = VirtualRunEnv(self).environment() env.define("CTEST_OUTPUT_ON_FAILURE", "ON") @@ -74,8 +75,7 @@ def build(self): def package(self): cmake = CMake(self) cmake.install() - if shutil.which("doxygen"): - cmake.build(target="install-doc") + cmake.build(target="install-doc") def package_info(self): self.cpp_info.libs = [ "cosimc" ] From 2e17dece16763602f3a5b64118c7bdcbbd13c224 Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Tue, 19 May 2026 12:39:57 +0200 Subject: [PATCH 3/4] Remove Doxygen as a mandatory tool requirement and conditionally build documentation if Doxygen is available --- conanfile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 57906d7..0c7fd43 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,7 +43,6 @@ def configure(self): # Dependencies/requirements tool_requires = ( "cmake/[>=4.0]", - "doxygen/1.17.0", ) requires = ( "libcosim/0.11.2@osp/stable", @@ -63,7 +62,8 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() - cmake.build(target="doc") + if shutil.which("doxygen"): + cmake.build(target="doc") if self._is_tests_enabled(): env = VirtualRunEnv(self).environment() @@ -75,7 +75,8 @@ def build(self): def package(self): cmake = CMake(self) cmake.install() - cmake.build(target="install-doc") + if shutil.which("doxygen"): + cmake.build(target="install-doc") def package_info(self): self.cpp_info.libs = [ "cosimc" ] From 8604429567791f55e7395a864a1c97e4722d5d2e Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Tue, 19 May 2026 12:54:37 +0200 Subject: [PATCH 4/4] Remove cmake installation from CI configuration --- .github/workflows/ci-conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 0687eee..f8bff3b 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -26,7 +26,7 @@ jobs: run: | apt-get update apt-get install -y pipx doxygen - pipx install conan cmake + pipx install conan echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan run: |