From fd5ebbfd2289f7bef3aa08372aeff35e38e8d4c2 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Wed, 1 May 2024 14:39:09 -0400
Subject: [PATCH] xo-pyutil: build: streamline using recent xo-cmake
 improvements

---
 CMakeLists.txt                  | 43 ++++++++-------------------------
 cmake/xo-bootstrap-macros.cmake | 35 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 cmake/xo-bootstrap-macros.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e3266..a20befe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,24 +3,19 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(xo_pyutil VERSION 0.1)
-enable_language(CXX)
 
-# common XO cmake macros (see github:Rconybea/xo-cmake)
-include(xo_macros/xo_cxx)
-include(xo_macros/code-coverage)   # very little to unit test here
+include(GNUInstallDirs)
+include(cmake/xo-bootstrap-macros.cmake)   # very little to unit test here
+
+xo_cxx_toplevel_options2()
 
 # ----------------------------------------------------------------
-# unit test setup
+# cmake -DCMAKE_BUILD_TYPE=coverage
+xo_toplevel_coverage_config2()
 
-enable_testing()
-## enable code coverage for all executables+libraries
-## (when configured with -DCODE_COVERAGE=ON)
-##
-add_code_coverage()
-add_code_coverage_all_targets(
-  EXCLUDE
-  /nix/store/*
-  ${PROJECT_SOURCE_DIR}/utest/*)
+# ----------------------------------------------------------------
+# cmake -DCMAKE_BUILD_TYPE=debug
+xo_toplevel_debug_config2()
 
 # ----------------------------------------------------------------
 # bespoke (usually temporary) c++ settings
@@ -29,36 +24,18 @@ set(PROJECT_CXX_FLAGS "")
 #set(PROJECT_CXX_FLAGS "-fconcepts-diagnostics-depth=2")
 add_definitions(${PROJECT_CXX_FLAGS})
 
-# ----------------------------------------------------------------
-# c++ settings
-
-xo_toplevel_compile_options()
-
-# ----------------------------------------------------------------
-# external dependencies
-#
-# set CMAKE_INSTALL_PREFIX to analog of /usr
-# to use .cmake assistants from /usr/lib/cmake/indentlog
-#
-# xo_dependency(..)
-
 # ----------------------------------------------------------------
 
 #add_subdirectory(example)
 #add_subdirectory(utest)
 
 # ----------------------------------------------------------------
-# output targets
 
 set(SELF_LIB xo_pyutil)
 add_library(${SELF_LIB} INTERFACE)
 xo_include_headeronly_options2(${SELF_LIB})
-
-# ----------------------------------------------------------------
-# standard install + provide find_package() support
-
 xo_install_library2(${SELF_LIB})
-xo_install_include_tree()
+xo_install_include_tree3(include/xo/pyutil)
 xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)
 
 # ----------------------------------------------------------------
diff --git a/cmake/xo-bootstrap-macros.cmake b/cmake/xo-bootstrap-macros.cmake
new file mode 100644
index 0000000..aba3116
--- /dev/null
+++ b/cmake/xo-bootstrap-macros.cmake
@@ -0,0 +1,35 @@
+# ----------------------------------------------------------------
+# for example:
+#   $ PREFIX=/usr/local   # for example
+#   $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build
+#
+# will get
+#   CMAKE_MODULE_PATH
+# from xo-cmake-config --cmake-module-path
+#
+# and expect .cmake macros in
+#   CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake
+# ----------------------------------------------------------------
+
+find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED)
+
+if ("${XO_CMAKE_CONFIG_EXECUTABLE}" STREQUAL "XO_CMAKE_CONFIG_EXECUTABLE-NOT_FOUND")
+    message(FATAL "could not find xo-cmake-config executable")
+endif()
+
+message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
+
+if (NOT XO_SUBMODULE_BUILD)
+    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)
+        message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+    endif()
+endif()
+
+# 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_cxx)
+
+xo_cxx_bootstrap_message()