From a2e75071cc8b5cf5ed1c2ba5f8e0af0a32c35cb8 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 4 Jan 2026 23:03:18 -0500 Subject: [PATCH] + xo-printable2 + build fixes for cmake config --- CMakeLists.txt | 16 +++++++++++++++- idl/IPrintable_DFloat.json5 | 11 +++++++++++ include/xo/object2/sequence/ISequence_Any.hpp | 4 ++-- include/xo/object2/sequence/ISequence_Xfer.hpp | 2 +- src/object2/CMakeLists.txt | 1 - 5 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 idl/IPrintable_DFloat.json5 diff --git a/CMakeLists.txt b/CMakeLists.txt index bb540b3..fc15ebf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,12 +37,26 @@ xo_add_genfacetimpl( OUTPUT_CPP_DIR src/object2 ) +get_target_property(xo_printable2_src_dir xo-printable2 xo_srcdir) +message(STATUS "xo_printable2_src_dir=${xo_printable_src_dir}") + +xo_add_genfacetimpl( + TARGET xo-object2-facetimpl-printable-float + FACET Printable + REPR Float + INPUT idl/IPrintable_DFloat.json5 + OUTPUT_HPP_DIR include/xo/object2 + OUTPUT_IMPL_SUBDIR . + OUTPUT_CPP_DIR src/object2 +) + # ---------------------------------------------------------------- # must complete definition of expression lib before configuring examples add_subdirectory(src/object2) add_subdirectory(utest) -#xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets) + +xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets) # ---------------------------------------------------------------- # docs targets depend on other library/utest/exec targets above, diff --git a/idl/IPrintable_DFloat.json5 b/idl/IPrintable_DFloat.json5 new file mode 100644 index 0000000..31d10dd --- /dev/null +++ b/idl/IPrintable_DFloat.json5 @@ -0,0 +1,11 @@ +{ + mode: "implementation", + includes: [], + namespace1: "xo", + namespace2: "print", + facet_idl: "idl/Printable.json5", + brief: "provide APrintable interface for DFloat", + using_doxygen: true, + repr: "DFloat", + doc: [ "doc for something or other" ], +} diff --git a/include/xo/object2/sequence/ISequence_Any.hpp b/include/xo/object2/sequence/ISequence_Any.hpp index 06838b3..dc9d73f 100644 --- a/include/xo/object2/sequence/ISequence_Any.hpp +++ b/include/xo/object2/sequence/ISequence_Any.hpp @@ -66,7 +66,7 @@ namespace scm { ///@} private: - /** @defgraoup scm-sequence-any-private-methods **/ + /** @defgroup scm-sequence-any-private-methods **/ ///@{ [[noreturn]] static void _fatal(); @@ -74,7 +74,7 @@ namespace scm { ///@} public: - /** @defgraoup scm-sequence-any-member-vars **/ + /** @defgroup scm-sequence-any-member-vars **/ ///@{ static typeseq s_typeseq; diff --git a/include/xo/object2/sequence/ISequence_Xfer.hpp b/include/xo/object2/sequence/ISequence_Xfer.hpp index 4a679b6..3bcad3d 100644 --- a/include/xo/object2/sequence/ISequence_Xfer.hpp +++ b/include/xo/object2/sequence/ISequence_Xfer.hpp @@ -57,7 +57,7 @@ namespace scm { using I = Impl; public: - /** @defgraoup scm-sequence-xfer-member-vars **/ + /** @defgroup scm-sequence-xfer-member-vars **/ ///@{ /** typeseq for template parameter DRepr **/ diff --git a/src/object2/CMakeLists.txt b/src/object2/CMakeLists.txt index fc66c97..f1359f3 100644 --- a/src/object2/CMakeLists.txt +++ b/src/object2/CMakeLists.txt @@ -16,4 +16,3 @@ xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 $ # note: deps here must also appear in cmake/xo_alloc2Config.cmake.in xo_dependency(${SELF_LIB} xo_gc) #xo_dependency(${SELF_LIB} indentlog) -#add_dependencies(${SELF_LIB} xo-object2-facetimpl-sequence-list)