From 8366dc62a1e2c0ea9141c5aedc5d1bb49f5a74fc Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 26 Jan 2026 16:05:37 -0500 Subject: [PATCH] init dep handling for xo-expression2 -> xo-procedure2 --- cmake/xo_expression2Config.cmake.in | 2 +- src/expression2/CMakeLists.txt | 2 +- src/expression2/init_expression2.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/xo_expression2Config.cmake.in b/cmake/xo_expression2Config.cmake.in index c8cfbcad..15ff18ff 100644 --- a/cmake/xo_expression2Config.cmake.in +++ b/cmake/xo_expression2Config.cmake.in @@ -8,7 +8,7 @@ include(CMakeFindDependencyMacro) # find_dependency(xo_gc) find_dependency(reflect) -find_dependency(xo_object2) +find_dependency(xo_procedure2) find_dependency(xo_printable2) find_dependency(xo_flatstring) find_dependency(cmake) diff --git a/src/expression2/CMakeLists.txt b/src/expression2/CMakeLists.txt index b8be9468..7a7013de 100644 --- a/src/expression2/CMakeLists.txt +++ b/src/expression2/CMakeLists.txt @@ -44,7 +44,7 @@ xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 $ # note: deps here must also appear in cmake/xo_expression2Config.cmake.in xo_dependency(${SELF_LIB} xo_gc) xo_dependency(${SELF_LIB} reflect) -xo_dependency(${SELF_LIB} xo_object2) +xo_dependency(${SELF_LIB} xo_procedure2) xo_dependency(${SELF_LIB} xo_printable2) xo_dependency(${SELF_LIB} xo_flatstring) xo_dependency(${SELF_LIB} subsys) diff --git a/src/expression2/init_expression2.cpp b/src/expression2/init_expression2.cpp index e975ef99..1ee5ec9e 100644 --- a/src/expression2/init_expression2.cpp +++ b/src/expression2/init_expression2.cpp @@ -7,7 +7,7 @@ #include "expression2_register_facets.hpp" #include "expression2_register_types.hpp" -#include +#include #include namespace xo { @@ -29,7 +29,7 @@ namespace xo { InitEvidence retval; /* direct subsystem deps for xo-object2/ */ - retval ^= InitSubsys::require(); + retval ^= InitSubsys::require(); /* xo-expression2/'s own initialization code */ retval ^= Subsystem::provide("expression2", &init);