From 94370c4775a938cd23eb3203792a87ddf7b901bd Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 6 Jan 2026 00:30:40 -0500 Subject: [PATCH] xo-arena: annex cmpresult.*pp from xo-alloc2 --- xo-alloc2/src/alloc2/CMakeLists.txt | 2 +- xo-arena/cmake/xo_arenaConfig.cmake.in | 1 + .../xo/alloc2 => xo-arena/include/xo/arena}/cmpresult.hpp | 0 xo-arena/src/arena/CMakeLists.txt | 2 ++ {xo-alloc2/src/alloc2 => xo-arena/src/arena}/cmpresult.cpp | 0 5 files changed, 4 insertions(+), 1 deletion(-) rename {xo-alloc2/include/xo/alloc2 => xo-arena/include/xo/arena}/cmpresult.hpp (100%) rename {xo-alloc2/src/alloc2 => xo-arena/src/arena}/cmpresult.cpp (100%) diff --git a/xo-alloc2/src/alloc2/CMakeLists.txt b/xo-alloc2/src/alloc2/CMakeLists.txt index ac1ae656..d6982bb7 100644 --- a/xo-alloc2/src/alloc2/CMakeLists.txt +++ b/xo-alloc2/src/alloc2/CMakeLists.txt @@ -5,7 +5,7 @@ set(SELF_SRCS # AllocError.cpp # AllocInfo.cpp - cmpresult.cpp +# cmpresult.cpp AAllocator.cpp # ArenaConfig.cpp diff --git a/xo-arena/cmake/xo_arenaConfig.cmake.in b/xo-arena/cmake/xo_arenaConfig.cmake.in index 3b32fb0e..1700fb8a 100644 --- a/xo-arena/cmake/xo_arenaConfig.cmake.in +++ b/xo-arena/cmake/xo_arenaConfig.cmake.in @@ -7,6 +7,7 @@ include(CMakeFindDependencyMacro) # in CMakeLists.txt # find_dependency(xo_reflectutil) +find_dependency(indentlog) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") check_required_components("@PROJECT_NAME@") diff --git a/xo-alloc2/include/xo/alloc2/cmpresult.hpp b/xo-arena/include/xo/arena/cmpresult.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/cmpresult.hpp rename to xo-arena/include/xo/arena/cmpresult.hpp diff --git a/xo-arena/src/arena/CMakeLists.txt b/xo-arena/src/arena/CMakeLists.txt index 345e9cc9..40977231 100644 --- a/xo-arena/src/arena/CMakeLists.txt +++ b/xo-arena/src/arena/CMakeLists.txt @@ -5,6 +5,7 @@ set(SELF_SRCS AllocError.cpp AllocInfo.cpp ArenaConfig.cpp + cmpresult.cpp ) xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS}) @@ -17,5 +18,6 @@ xo_install_include_tree3(include/xo/arena) # xo-arena/cmake/xo_arenaConfig.cmake.in xo_dependency(${SELF_LIB} xo_reflectutil) +xo_dependency(${SELF_LIB} indentlog) # end src/CMakeLists.txt diff --git a/xo-alloc2/src/alloc2/cmpresult.cpp b/xo-arena/src/arena/cmpresult.cpp similarity index 100% rename from xo-alloc2/src/alloc2/cmpresult.cpp rename to xo-arena/src/arena/cmpresult.cpp