xo-pyreflect: build: streamline using recent xo-cmake improvements

CMakeLists.txt

@@ -3,26 +3,19 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(xo_pyreflect VERSION 0.1)
-enable_language(CXX)
 
-# common XO cmake macros (see github.com:Rconybea/xo-cmake)
-include(xo_macros/xo_cxx)
-include(xo_macros/code-coverage)
+include(GNUInstallDirs)
+include(cmake/xo-bootstrap-macros.cmake)
+
+xo_cxx_toplevel_options2()
 
 # ----------------------------------------------------------------
-# unit test setup
+# cmake -DCMAKE_BUILD_TYPE=coverage
+xo_toplevel_coverage_config2()
 
-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/*)
+# ----------------------------------------------------------------
+# cmake -DCMAKE_BUILD_TYPE=debug
+xo_toplevel_debug_config2()
 
 # ----------------------------------------------------------------
 # c++ settings (usually temporary)
@@ -30,12 +23,8 @@ 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
 
-# note: library=pyreflect (not xo_pyreflect) -> establishes pyreflectTargets
 add_subdirectory(src/pyreflect)
 #add_subdirectory(utest)
 
@@ -44,7 +33,4 @@ add_subdirectory(src/pyreflect)
 
 xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)
 
-# ----------------------------------------------------------------
-# install .hpp files
-
-#xo_install_include_tree()
+# end CMakeLists.txt

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()

src/pyreflect/CMakeLists.txt

@@ -4,9 +4,6 @@ set(SELF_LIB pyreflect)
 set(SELF_SRCS pyreflect.cpp)
 
 # ----------------------------------------------------------------
-# pybind11 dep
 
 xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS})
-
 xo_pybind11_dependency(${SELF_LIB} reflect)
-

src/pyreflect/pyreflect.cpp

@@ -26,6 +26,12 @@ namespace xo {
             //py::class_<utc_nanos>(m, "utc_nanos");
 
             //py::class_<TypeDescrImpl>(m, "TypeDescr");
+            /* TypeDescrBase instances are created automatically at library load time
+             * by static initializers.  The reflection library (xo-reflect) is responsible
+             * for lifetime of TypeDescrobjects.  Under no circumstances should python
+             * (or pybind11) directly destroy a TypeDescrImpl instance, hence use of
+             * unowned_ptr<TypeDescrBase> here.
+             */
             py::class_<TypeDescrBase,
                        unowned_ptr<TypeDescrBase>>(m, "TypeDescr")
                 .def_static("print_reflected_types",