From bc5a2c3959aead2881c30fe8e87f71420a581bf2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 31 May 2026 00:12:29 -0400 Subject: [PATCH] xo-interpreter2: build: fix cmake nits [PKG][BUGFIX] --- CMakeLists.txt | 12 ------------ cmake/xo_interpreter2Config.cmake.in | 2 +- src/interpreter2/CMakeLists.txt | 5 +---- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18463e9d..1ab36e49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmapplyframe FACET_PKG xo_alloc2 -# REPR VsmApplyFrame INPUT idl/IGCObject_DVsmApplyFrame.json5 ) @@ -63,7 +62,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmapplyframe FACET_PKG xo_printable2 -# REPR VsmApplyFrame INPUT idl/IPrintable_DVsmApplyFrame.json5 ) @@ -73,7 +71,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmevalargsframe FACET_PKG xo_alloc2 -# REPR VsmEvalArgsFrame INPUT idl/IGCObject_DVsmEvalArgsFrame.json5 ) @@ -81,7 +78,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmevalargsframe FACET_PKG xo_printable2 -# REPR DVsmEvalArgsFrame INPUT idl/IPrintable_DVsmEvalArgsFrame.json5 ) @@ -91,7 +87,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmapplyclosureframe FACET_PKG xo_alloc2 -# REPR VsmApplyClosureFrame INPUT idl/IGCObject_DVsmApplyClosureFrame.json5 ) @@ -99,7 +94,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmapplyclosureframe FACET_PKG xo_printable2 -# REPR DVsmApplyClosureFrame INPUT idl/IPrintable_DVsmApplyClosureFrame.json5 ) @@ -109,7 +103,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmifelsecontframe FACET_PKG xo_alloc2 -# REPR VsmIfElseContFrame INPUT idl/IGCObject_DVsmIfElseContFrame.json5 ) @@ -117,7 +110,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmifelsecontframe FACET_PKG xo_printable2 -# REPR VsmIfElseContFrame INPUT idl/IPrintable_DVsmIfElseContFrame.json5 ) @@ -127,7 +119,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-vsmseqcontframe FACET_PKG xo_alloc2 -# REPR VsmSeqContFrame INPUT idl/IGCObject_DVsmSeqContFrame.json5 ) @@ -135,7 +126,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-vsmseqcontframe FACET_PKG xo_printable2 -# REPR DVsmSeqContFrame INPUT idl/IPrintable_DVsmSeqContFrame.json5 ) @@ -154,7 +144,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-gcobject-closure FACET_PKG xo_alloc2 -# REPR Closure INPUT idl/IGCObject_DClosure.json5 ) @@ -162,7 +151,6 @@ xo_add_genfacetimpl( xo_add_genfacetimpl( TARGET xo-interpreter2-facetimpl-printable-closure FACET_PKG xo_printable2 -# REPR Closure INPUT idl/IPrintable_DClosure.json5 ) diff --git a/cmake/xo_interpreter2Config.cmake.in b/cmake/xo_interpreter2Config.cmake.in index 3310d075..f7a4d276 100644 --- a/cmake/xo_interpreter2Config.cmake.in +++ b/cmake/xo_interpreter2Config.cmake.in @@ -6,7 +6,7 @@ include(CMakeFindDependencyMacro) # must coordinate with xo_dependency() calls # in CMakeLists.txt # -find_dependency(xo_expression2) +find_dependency(xo_reader2) find_dependency(xo_gc) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/src/interpreter2/CMakeLists.txt b/src/interpreter2/CMakeLists.txt index 5f40b44f..37e9ebfe 100644 --- a/src/interpreter2/CMakeLists.txt +++ b/src/interpreter2/CMakeLists.txt @@ -52,7 +52,4 @@ xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 $ # note: deps here must also appear in cmake/xo_interpreter2Config.cmake.in xo_dependency(${SELF_LIB} xo_reader2) xo_dependency(${SELF_LIB} xo_gc) -#xo_dependency(${SELF_LIB} reflect) -#xo_dependency(${SELF_LIB} xo_printable2) -#xo_dependency(${SELF_LIB} xo_flatstring) -#xo_dependency(${SELF_LIB} indentlog) +