From ef0b02f4cae31cd7f3e24f2afd6c126fca62e6d1 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Wed, 27 Sep 2023 16:32:29 -0400
Subject: [PATCH] reflect: use xo_macros code coverage

---
 CMakeLists.txt  |  3 +--
 cmake/cxx.cmake | 37 -------------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b0240d..4ca908c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,7 @@ enable_language(CXX)
 
 # common XO cmake macros (see proj/xo-cmake)
 include(xo_macros/xo_cxx)
-include(cmake/cxx.cmake)
-include(cmake/code-coverage.cmake)
+include(xo_macros/code-coverage)
 
 # ----------------------------------------------------------------
 # unit test setup
diff --git a/cmake/cxx.cmake b/cmake/cxx.cmake
index ede44e3..e69de29 100644
--- a/cmake/cxx.cmake
+++ b/cmake/cxx.cmake
@@ -1,37 +0,0 @@
-## ----------------------------------------------------------------
-## variable
-##   XO_ADDRESS_SANITIZE
-## determines whether to enable address sanitizer for the XO project
-## (see toplevel CMakeLists.txt)
-## ----------------------------------------------------------------
-#if(XO_ADDRESS_SANITIZE)
-#    add_compile_options(-fsanitize=address)
-#    add_link_options(-fsanitize=address)
-#endif()
-#
-## XO_STANDARD_COMPILE_OPTIONS: use these when XO_ADDRESS_SANITIZE=OFF
-#set(XO_STANDARD_COMPILE_OPTIONS -Werror -Wall -Wextra)
-#
-## XO_ADDRESS_SANITIZE_COMPILE_OPTIONS: use when XO_ADDRESS_SANITIZE=ON
-##
-## address sanitizer build complains about _FORTIFY_SOURCE redefines
-##    In file included from <built-in>:460:
-##    <command line>:1:9: error: '_FORTIFY_SOURCE' macro redefined [-Werror,-Wmacro-redefined]
-##    #define _FORTIFY_SOURCE 2
-##
-#set(XO_ADDRESS_SANITIZE_COMPILE_OPTIONS -Werror -Wall -Wextra -Wno-macro-redefined)
-#
-## XO_COMPILE_OPTIONS: use these with xo_compile_options() macro
-#if(XO_ADDRESS_SANITIZE)
-#    set(XO_COMPILE_OPTIONS ${XO_ADDRESS_SANITIZE_COMPILE_OPTIONS})
-#else()
-#    set(XO_COMPILE_OPTIONS ${XO_STANDARD_COMPILE_OPTIONS})
-#endif()
-#
-## ----------------------------------------------------------------
-## generally want all the errors+warnings!
-## however: address sanitizer generates error on _FORTIFY_SOURCE
-##
-#macro(xo_compile_options target)
-#    target_compile_options(${target} PRIVATE ${XO_COMPILE_OPTIONS})
-#endmacro()