From 2b16672c9c919cfe193fe497207c42f4ebf7fa77 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 31 May 2026 09:50:13 -0400
Subject: [PATCH] build: update cmake bootstrap macros for in-tree builds

Once these are done for all xo-foo satellites, should be able
to complete cmake build without first installing xo-cmake.
---
 cmake/xo-bootstrap-macros.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/xo-bootstrap-macros.cmake b/cmake/xo-bootstrap-macros.cmake
index 3cbc8f79..592272c0 100644
--- a/cmake/xo-bootstrap-macros.cmake
+++ b/cmake/xo-bootstrap-macros.cmake
@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------
 # for example:
-#   $ PREFIX=/usr/local
+#   $ PREFIX=/usr/local   # for example
 #   $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build
 #
 # will get
@@ -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)