From e4088392b8b45e4224cdaed100c337db7d3ec4e8 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 14 Sep 2024 12:20:27 -0500
Subject: [PATCH] xo-pyprintjson: build: update to latest xo-cmake macros

---
 CMakeLists.txt                 | 22 ++++------------------
 src/pyprintjson/CMakeLists.txt |  3 ++-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 603f7253..dd29fbc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,25 +3,11 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(xo_pyprintjson VERSION 1.0)
-enable_language(CXX)
 
-# common XO cmake macros (see github.com:Rconybea/xo-cmake)
+include(GNUInstallDirs)
 include(cmake/xo-bootstrap-macros.cmake)
 
-# ----------------------------------------------------------------
-# unit test setup
-
-enable_testing()
-# activate code coverage for all executables + libraries (when configured with -DCODE_COVERAGE=ON)
-add_code_coverage()
-# 1. assuming that /nix/store/ prefixes .hpp files belonging to gcc, catch2 etc.
-#    we're not interested in code coverage for these sources.
-# 2. exclude the utest/ subdir, we don't need coverage on the unit tests themselves;
-#    rather,  want coverage on the code that the unit tests exercise.
-#
-# NOTE: this seems to work only with the 'ccov-all' target.  In particular,  doesn't seem to do anything with the 'ccov' target
-#
-add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/* ${PROJECT_BINARY_DIR}/local/* ${PROJECT_SOURCE_DIR}/repo/*)
+xo_cxx_toplevel_options3()
 
 # ----------------------------------------------------------------
 # c++ settings (usually temporary)
@@ -29,8 +15,6 @@ add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/*
 set(PROJECT_CXX_FLAGS "")
 add_definitions(${PROJECT_CXX_FLAGS})
 
-xo_toplevel_compile_options()
-
 # ----------------------------------------------------------------
 # sources
 
@@ -41,3 +25,5 @@ add_subdirectory(src/pyprintjson)
 # provide find_package() support
 
 xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)
+
+# end CMakeLists.txt
diff --git a/src/pyprintjson/CMakeLists.txt b/src/pyprintjson/CMakeLists.txt
index a45f1b82..defff223 100644
--- a/src/pyprintjson/CMakeLists.txt
+++ b/src/pyprintjson/CMakeLists.txt
@@ -3,7 +3,8 @@
 set(SELF_LIB xo_pyprintjson)
 set(SELF_SRCS pyprintjson.cpp)
 
-xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS})
+# ----------------------------------------------------------------
 
+xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS})
 xo_pybind11_dependency(${SELF_LIB} printjson)
 xo_pybind11_header_dependency(${SELF_LIB} xo_pyreflect)