diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43ded08e..c3afcca9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,29 +2,22 @@
 
 cmake_minimum_required(VERSION 3.10)
 
-project(indentlog VERSION 0.1)
-enable_language(CXX)
+project(indentlog VERSION 1.0)
 
-# common XO cmake macros (see proj/xo-cmake)
+include(GNUInstallDirs)
 include(cmake/xo-bootstrap-macros.cmake)
 
-# ----------------------------------------------------------------
-# unit test setup
-
-enable_testing()
-# activate code coverage for all executables + libraries (when -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.
-#
-add_code_coverage_all_targets(EXCLUDE /nix/store/* utest/*)
+xo_cxx_toplevel_options2()
 
 # ----------------------------------------------------------------
+# cmake -DCMAKE_BUILD_TYPE=debug
+xo_toplevel_debug_config2()
 
-xo_toplevel_compile_options()
+# ----------------------------------------------------------------
+# cmake -DCMAKE_BUILD_TYPE=coverage
+xo_toplevel_coverage_config2()
+
+# ----------------------------------------------------------------
 
 add_subdirectory(example)
 add_subdirectory(utest)
@@ -32,14 +25,9 @@ add_subdirectory(utest)
 # header-only library.
 # see [[https://stackoverflow.com/questions/47718485/install-and-export-interface-only-library-cmake]]
 #
-xo_add_headeronly_library(indentlog)
-
-# ----------------------------------------------------------------
-# standard install + provide find_package() support
-
-#xo_install_library2(indentlog)
-#xo_install_include_tree()
-xo_install_library4(indentlog ${PROJECT_NAME}Targets)
+set(SELF_LIB indentlog)
+xo_add_headeronly_library(${SELF_LIB})
+xo_install_library4(${SELF_LIB} ${PROJECT_NAME}Targets)
 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
index 3899fe86..aba31169 100644
--- a/cmake/xo-bootstrap-macros.cmake
+++ b/cmake/xo-bootstrap-macros.cmake
@@ -1,15 +1,35 @@
-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)
+# ----------------------------------------------------------------
+# 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)
-    message("-- GUESSED_CMAKE_CMD=cmake -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -B ${CMAKE_BINARY_DIR}")
-    message("-- CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
-    message("-- CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+    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-project-macros)
+include(xo_macros/xo_cxx)
+
+xo_cxx_bootstrap_message()
diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt
index 1b92e999..ea4bb819 100644
--- a/utest/CMakeLists.txt
+++ b/utest/CMakeLists.txt
@@ -6,40 +6,12 @@ set(SELF_SOURCE_FILES
     filename.test.cpp code_location.test.cpp function.test.cpp
     indentlog_utest_main.cpp)
 
-add_executable(${SELF_EXECUTABLE_NAME} ${SELF_SOURCE_FILES})
-xo_include_options2(${SELF_EXECUTABLE_NAME})
-
-add_test(NAME ${SELF_EXECUTABLE_NAME} COMMAND ${SELF_EXECUTABLE_NAME})
-target_code_coverage(${SELF_EXECUTABLE_NAME} AUTO ALL)
+xo_add_utest_executable(${SELF_EXECUTABLE_NAME} ${SELF_SOURCE_FILES})
 
 # ----------------------------------------------------------------
 # 3rd party dependency: catch2
 
+xo_self_dependency(${SELF_EXECUTABLE_NAME} indentlog)
 xo_external_target_dependency(${SELF_EXECUTABLE_NAME} Catch2 Catch2::Catch2)
 
-# 1. using target_link_libraries(.. Catch2) here doesn't work;
-#    build tries to link to a Catch2 library.
-#    perhaps Catch2 target not declared INTERFACE?
-# 2. nix build doesn't need this;  dependency on catch2
-#    puts include directory in NIX_CFLAGS_COMPILE,  so stuff 'just works'
-#
-
-#find_package(Catch2 2 REQUIRED)
-#target_link_libraries(${SELF_EXECUTABLE_NAME} Catch2::Catch2)
-
-#set(Catch2_INCLUDES "${Catch2_DIR}/../../../include")
-#target_include_directories(${SELF_EXECUTABLE_NAME} PUBLIC ${Catch2_INCLUDES})
-
-#xo_internal_dependency(${SELF_EXECUTABLE_NAME} Catch2)
-#target_link_libraries(${SELF_EXECUTABLE_NAME} PUBLIC Catch2)
-
-# ----------------------------------------------------------------
-# make standard directories for std:: includes explicit
-# so that
-# (1) they appear in compile_commands.json.
-# (2) clangd (run from emacs lsp-mode) can find them
-#
-if(CMAKE_EXPORT_COMPILE_COMMANDS)
-  set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES
-      ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
-endif()
+# end CMakeLists.txt