From 60bcc640a04ef20068d67893d7e156792fcfe74b Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 6 Jun 2026 20:14:50 -0400 Subject: [PATCH] .forgejo workflow: + xo-imgui [CI] cmake macro refresh [PKG] --- .forgejo/workflows/ci.yaml | 6 ++++++ xo-cmake/etc/xo/subsystem-list | 2 ++ xo-imgui/cmake/xo-bootstrap-macros.cmake | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 39070751..a81c0d02 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -383,3 +383,9 @@ jobs: echo nix-build ci.nix -A xo-pykalmanfilter nix-build ci.nix -A xo-pykalmanfilter ls -l ./result + + - name: build xo-imgui + run: | + echo nix-build ci.nix -A xo-imgui + nix-build ci.nix -A xo-imgui + ls -l ./result diff --git a/xo-cmake/etc/xo/subsystem-list b/xo-cmake/etc/xo/subsystem-list index a952c1b3..8daf757d 100644 --- a/xo-cmake/etc/xo/subsystem-list +++ b/xo-cmake/etc/xo/subsystem-list @@ -57,3 +57,5 @@ xo-interpreter xo-interpreter2 xo-reader2 xo-symboltable +xo-equable2 +xo-hashable2 diff --git a/xo-imgui/cmake/xo-bootstrap-macros.cmake b/xo-imgui/cmake/xo-bootstrap-macros.cmake index aba31169..592272c0 100644 --- a/xo-imgui/cmake/xo-bootstrap-macros.cmake +++ b/xo-imgui/cmake/xo-bootstrap-macros.cmake @@ -19,7 +19,13 @@ endif() message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}") -if (NOT XO_SUBMODULE_BUILD) +if (XO_SUBMODULE_BUILD) + if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) + # local version of xo-cmake macros + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/xo-cmake/cmake") + message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") + endif() +else() if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) # default to typical install location for xo-project-macros execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)