From 62d62e60a0ca6c3af167b28cb56167d6262bfca6 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:10:14 -0400 Subject: [PATCH 01/14] github: + doxygen dep --- .github/workflows/main-stock-ubuntu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index a3a54bce..786887c0 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -49,6 +49,10 @@ jobs: sudo apt install -y llvm-18-dev echo "::endgroup" + echo "::group::doxygen install" + sudo apt install -y doxygen + echo "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install" From c77ec7a2c8aac37c9b2343a83a0c01b3becf9d80 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:23:05 -0400 Subject: [PATCH 02/14] github: + sphinx dep in workflow --- .github/workflows/main-stock-ubuntu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index 786887c0..d880bf82 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -53,6 +53,10 @@ jobs: sudo apt install -y doxygen echo "::endgroup" + echo "::group::sphinx install" + sudo apt install -y sphinx + echo "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install" From 9529ba27f43b46e5afca0ba0729639cd263b6d50 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:28:26 -0400 Subject: [PATCH 03/14] xo-imgui: correct CMakeLists.txt spelling --- xo-imgui/src/imgui/{CMakelists.txt => CMakeLists.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename xo-imgui/src/imgui/{CMakelists.txt => CMakeLists.txt} (100%) diff --git a/xo-imgui/src/imgui/CMakelists.txt b/xo-imgui/src/imgui/CMakeLists.txt similarity index 100% rename from xo-imgui/src/imgui/CMakelists.txt rename to xo-imgui/src/imgui/CMakeLists.txt From 032a2ad868bf0be28dcada8400dc9af61390a9bf Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:33:18 -0400 Subject: [PATCH 04/14] github: + imgui dep --- .github/workflows/main-stock-ubuntu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index d880bf82..fd76da3b 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -57,6 +57,10 @@ jobs: sudo apt install -y sphinx echo "::endgroup" + echo "::group::imgui install" + sudo apt install -y imgui + echo "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install" From d015f3ad2dabc1868b286a8d3ed2dcfe4fd8657a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:36:28 -0400 Subject: [PATCH 05/14] github: libimqui-dev spelling --- .github/workflows/main-stock-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index fd76da3b..ff2057d2 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -58,7 +58,7 @@ jobs: echo "::endgroup" echo "::group::imgui install" - sudo apt install -y imgui + sudo apt install -y libimgui-dev echo "::endgroup" #echo "::group::clang18 install" From d537a84f6577ad15809975f386a52df86464a291 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:42:21 -0400 Subject: [PATCH 06/14] github: + vulkan deps --- .github/workflows/main-stock-ubuntu.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index ff2057d2..8fa9aa6c 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -57,10 +57,22 @@ jobs: sudo apt install -y sphinx echo "::endgroup" - echo "::group::imgui install" + echo "::group::libimgui-dev install" sudo apt install -y libimgui-dev echo "::endgroup" + echo "::group::libvulkan-dev install" + sudo apt install -y libvulkan-dev + echo "::endgroup" + + echo "::group::vulkan-tools install" + sudo apt install -y vulkan-tools + echo "::endgroup" + + echo "::group::vulkan-validationlayers-dev install" + sudo apt install -y vulkan-validationlayers-dev + echo "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install" From 09eb1e9a2fa9fc746b78ea12cd042d4531ad596e Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:44:52 -0400 Subject: [PATCH 07/14] github: spelling for vulkan validation dep --- .github/workflows/main-stock-ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index 8fa9aa6c..64a88100 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -69,8 +69,8 @@ jobs: sudo apt install -y vulkan-tools echo "::endgroup" - echo "::group::vulkan-validationlayers-dev install" - sudo apt install -y vulkan-validationlayers-dev + echo "::group::vulkan-utility-libraries-dev install" + sudo apt install -y vulkan-utility-libraries-dev echo "::endgroup" #echo "::group::clang18 install" From ed2df23faac1725bd0ccd20e76df471913563041 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:55:53 -0400 Subject: [PATCH 08/14] github: + libsdl2-dev dep --- .github/workflows/main-stock-ubuntu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index 64a88100..a8b73dcd 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -73,6 +73,10 @@ jobs: sudo apt install -y vulkan-utility-libraries-dev echo "::endgroup" + echo "::group::libsdl2-dev" + sudo apt install -y libsdl2-dev + ehco "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install" From f1c3f2392dceb97df68499b2e9ed9e3f39942730 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 22:58:53 -0400 Subject: [PATCH 09/14] github: 'echo' typo --- .github/workflows/main-stock-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index a8b73dcd..99651cd6 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -75,7 +75,7 @@ jobs: echo "::group::libsdl2-dev" sudo apt install -y libsdl2-dev - ehco "::endgroup" + echo "::endgroup" #echo "::group::clang18 install" #sudo apt install -y clang-18 From aad2dff6fc376ef10186b5ce9d67d5b0a5e021b0 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 23:16:58 -0400 Subject: [PATCH 10/14] github: clone imgui from github (ubuntu package not useful) --- .github/workflows/main-stock-ubuntu.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index 99651cd6..37d056a6 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -57,10 +57,6 @@ jobs: sudo apt install -y sphinx echo "::endgroup" - echo "::group::libimgui-dev install" - sudo apt install -y libimgui-dev - echo "::endgroup" - echo "::group::libvulkan-dev install" sudo apt install -y libvulkan-dev echo "::endgroup" @@ -100,6 +96,13 @@ jobs: # this should be sufficient for find_package(Catch2) to work + - name: clone imgui + run: | + + echo "::group::clone imgui" + git clone https://github.com/ocornut/imgui.git + echo "::endgroup" + - name: list /usr/lib run: | ls /usr/lib From 2e507be500381cf3ed31d9da9c75154a949ebf72 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 23:37:33 -0400 Subject: [PATCH 11/14] build: try hint for imgui --- xo-imgui/src/imgui/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/xo-imgui/src/imgui/CMakeLists.txt b/xo-imgui/src/imgui/CMakeLists.txt index 7a4670e5..c5452600 100644 --- a/xo-imgui/src/imgui/CMakeLists.txt +++ b/xo-imgui/src/imgui/CMakeLists.txt @@ -2,6 +2,7 @@ find_path(IMGUI_INCLUDE_DIR NAMES imgui/imgui.h + HINTS ${XO_UMBRELLA_SOURCE_DIR}/ DOC "path to imgui header") if (IMGUI_INCLUDE_DIR) message(STATUS From 3344fb4749cd445331e25ef95bec6215caf7aec6 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 23:47:32 -0400 Subject: [PATCH 12/14] xo-indentlog: ppdetail_atomic -> ppdetail --- xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp b/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp index 3f460a76..dfeaf415 100644 --- a/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp +++ b/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp @@ -16,7 +16,7 @@ namespace xo { // Defining this means ppdetail_atomic is not used. // In that case where not explicitly specialized ppdetail will revert to ordinary printing for a type, // instead of giving compile-time error about missing template specialization of ppdetail. -//#define ppdetail_atomic ppdetail +#define ppdetail_atomic ppdetail struct ppindentinfo { ppindentinfo(ppstate * pps, std::uint32_t ci0, std::uint32_t indent_width, bool upto) From 7793097cfeba50841263adf44ac39a7a763b0527 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 3 Sep 2025 23:59:52 -0400 Subject: [PATCH 13/14] xo-unit: bugfix: missing ppdetail_atomic check --- xo-unit/include/xo/unit/quantity_iostream.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xo-unit/include/xo/unit/quantity_iostream.hpp b/xo-unit/include/xo/unit/quantity_iostream.hpp index 5bc58d0b..b31df130 100644 --- a/xo-unit/include/xo/unit/quantity_iostream.hpp +++ b/xo-unit/include/xo/unit/quantity_iostream.hpp @@ -22,6 +22,7 @@ namespace xo { } /*namespace qty*/ namespace print { +#ifndef ppdetail_atomic template struct ppdetail> { using target_type = xo::qty::quantity; @@ -30,6 +31,7 @@ namespace xo { return ppdetail_atomic::print_pretty(ppii, x); } }; +#endif } /*namespace print*/ } /*namespace xo*/ From d1909d406b403f3de8ffaee39c6904edbe82dbfc Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Thu, 4 Sep 2025 00:09:28 -0400 Subject: [PATCH 14/14] github: + libbsd-dev dep --- .github/workflows/main-stock-ubuntu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index 37d056a6..07ef8245 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -73,6 +73,10 @@ jobs: sudo apt install -y libsdl2-dev echo "::endgroup" + echo "::group::libbsd-dev" + sudo apt install -y libbsd-dev + echo "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install"