diff --git a/CMakeLists.txt b/CMakeLists.txt
index 189db40..29f5bd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,38 @@
+# xo-subsys/CMakeLists.txt
+
 cmake_minimum_required(VERSION 3.10)
 
 project(subsys VERSION 0.1)
-enable_language(CXX)
 
-include(xo_macros/xo_cxx)
-include(xo_macros/code-coverage)
+include(GNUInstallDirs)
+include(cmake/xo-bootstrap-macros.cmake)
 
-enable_testing()
-# activate code coverage for all executables + libraries (when -DCODE_COVERAGE=ON)
-add_code_coverage()
+xo_cxx_toplevel_options2()
+
+# ----------------------------------------------------------------
+# cmake -DCMAKE_BUILD_TYPE=coverage
+xo_toplevel_coverage_config2()
+
+# ----------------------------------------------------------------
+# cmake -DCMAKE_BUILD_TYPE=debug
+xo_toplevel_debug_config2()
 
-# 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/*)
 
 set(XO_PROJECT_NAME subsys)
 
-xo_toplevel_compile_options()
-
 # ----------------------------------------------------------------
 # installing header-only library
 
-add_library(subsys INTERFACE)
-xo_include_headeronly_options2(subsys)
-xo_install_library2(subsys)
+set(SELF_LIB subsys)
+xo_add_headeronly_library(${SELF_LIB})
+xo_install_library4(${SELF_LIB} ${PROJECT_NAME}Targets)
+#add_library(subsys INTERFACE)
+#xo_include_headeronly_options2(subsys)
+#xo_install_library2(subsys)
 
 # ----------------------------------------------------------------
 # provide find_package() support
 
 xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)
 
-# ----------------------------------------------------------------
-# install .hpp
-
-xo_install_include_tree()
-
 # end CMakeLists.txt
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()