From 260f3435e1f06a4b95a3af41e99a6ac543ea4909 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 15 Mar 2024 19:35:02 -0400
Subject: [PATCH] build: streamline CMAKE_MODULE_PATH interaction

---
 .gitignore                      |  2 +-
 CMakeLists.txt                  |  3 +--
 cmake/xo-bootstrap-macros.cmake | 12 ++++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 cmake/xo-bootstrap-macros.cmake

diff --git a/.gitignore b/.gitignore
index 3e50f879..b1adb07b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 # symlink -> build/compile_commands.json should be created manually
 compile_commands.json
 # typical build directories
-build
+.build*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b63e290e..94fd52ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,7 @@ project(webutil VERSION 1.0)
 enable_language(CXX)
 
 # common XO cmake macros (see proj/xo-cmake)
-include(xo_macros/xo_cxx)
-include(xo_macros/code-coverage)
+include(cmake/xo-bootstrap-macros.cmake)
 
 # ----------------------------------------------------------------
 # unit test setup (no unit tests yet,  but want 'make tests' to do something)
diff --git a/cmake/xo-bootstrap-macros.cmake b/cmake/xo-bootstrap-macros.cmake
new file mode 100644
index 00000000..16644435
--- /dev/null
+++ b/cmake/xo-bootstrap-macros.cmake
@@ -0,0 +1,12 @@
+if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL "prefix"))
+    # default to typical install location for xo-project-macros
+    set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake)
+endif()
+
+message("-- CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message("-- CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+
+# needs to have been installed somewhere on CMAKE_MODULE_PATH,
+# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX)
+#
+include(xo_macros/xo-project-macros)