xo-ratio: build: streamline docs+utest setup

cmake/gen-ccov.in

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-srcdir=@PROJECT_SOURCE_DIR@
-builddir=@PROJECT_BINARY_DIR@
-lcov=@LCOV_EXECUTABLE@
-genhtml=@GENHTML_EXECUTABLE@
-
-if [[ $lcov == "LCOV_EXECUTABLE-NOTFOUND" ]]; then
-    echo "gen-ccov: lcov executable not found"
-    exit 1
-fi
-
-if [[ $genhtml == "GENHTML_EXECUTABLE-NOTFOUND" ]]; then
-    echo "gen-ccov: genhtml executable not found"
-    exit 1
-fi
-
-mkdir $builddir/ccov
-
-$srcdir/cmake/lcov-harness $srcdir $builddir $builddir/ccov/out $lcov $genhtml

cmake/lcov-harness

@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-
-srcdir=$1
-builddir=$2
-outputstem=$3
-lcov=$4
-genhtml=$5
-
-if [[ -z "${srcdir}" ]]; then
-    echo "lcov-harness: expected non-empty srcdir"
-    exit 1
-fi
-
-if [[ -z ${builddir} ]]; then
-    echo "lcov-harness: expected non-empty builddir"
-    exit 1
-fi
-
-if [[ -z ${outputstem} ]]; then
-    echo "lcov-harness: expected non-empty outputstem"
-    exit 1
-fi
-
-if [[ -z ${lcov} ]]; then
-    echo "lcov-harness: exepcted non-empty lcov"
-    exit 1
-fi
-
-if [[ -z ${genhtml} ]]; then
-    echo "lcov-harness: expected non-empty genhtml"
-    exit 1
-fi
-
-# directory stems for location of {.gcda, gcno} coverage information,
-#
-# if we have source tree:
-#
-#   ${srcdir}
-#   +- foo
-#   |  \- foo.cpp
-#   \- bar
-#      \- quux
-#         +- quux.cpp
-#         \- quux_main.cpp
-#
-# then we expect build tree:
-#
-#   ${builddir}
-#   +- foo
-#   |  \- CMakeFiles
-#   |     \- foo_target.dir
-#   |        +- foo.cpp.gcda
-#   |        \- foo.cpp.gcno
-#   +- bar
-#      \- quux
-#         \- CMakeFiles
-#            \- target4quux.dir
-#               +- quux.cpp.gcda
-#               +- quux.cpp.gcno
-#               +- quux_main.cpp.gcda
-#               \- quux_main.cpp.gcno
-#
-# in which case will have cmd_body:
-#
-#   ${primarydirs}
-#      ./foo/CMakeFiles/foo_target.dir
-#      ./bar/quux/CMakeFiles/target4quux.dir
-#
-# here foo_target, quux_target are whatever build is using for corresponding cmake target names.
-#
-# We want to invoke lcov like:
-#
-#   lcov --capture \
-#        --output ${builddir}/ccov \
-#        --exclude /utest/ \
-#        --base-directory ${srcdir}/foo --directory ${builddir}/foo/CMakeFiles/foo_target.dir \
-#        --base-directory ${srcdir}/bar/quux --directory ${builddir}/bar/quux/CMakeFiles/target4quux.dir
-#
-primarydirs=$(cd ${builddir} && find -name '*.gcno' \
-                  | xargs --replace=xx dirname xx \
-                  | uniq \
-                  | sed -e 's:^\./::')
-
-#echo "primarydirs=${primarydirs}"
-
-cmd="${lcov} --output ${outputstem}.info --capture --ignore-errors source"
-
-for bdir in ${primarydirs}; do
-    sdir=$(dirname $(dirname ${bdir}))
-
-    cmd="${cmd} --base-directory ${srcdir}/${sdir} --directory ${builddir}/${bdir}"
-done
-
-#echo cmd=${cmd}
-
-set -x
-
-# capture
-${cmd}
-
-# keep only files with paths under source tree
-# (don't want coverage for external libraries such as libstdc++ etc)
-${lcov} --extract ${outputstem}.info "${srcdir}/*" --output ${outputstem}2.info
-
-# remove unit test dirs
-# (we're interested in coverage of our installed code,  not of the unit tests that exercise it)
-${lcov} --remove ${outputstem}2.info '*/utest/*' --output ${outputstem}3.info
-
-# generate .html tree
-mkdir -p ${builddir}/ccov/html
-${genhtml} --ignore-errors source --show-details --prefix ${srcdir} --output-directory ${builddir}/ccov/html ${outputstem}3.info
-
-# also send report to stdout
-${lcov} --list ${outputstem}3.info

cmake/xo-bootstrap-macros.cmake

@@ -1,15 +1,33 @@
+# ----------------------------------------------------------------
+# 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 (("${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)
+    message(FATAL "could not find xo-cmake-config executable")
 endif()
 
 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} -DCMAKE_INSTALL_DOCDIR=${CMAKE_INSTALL_DOCDIR} -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()