From f9a83106693ad3a9a1dacb25ab32e6cec8c24da8 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Mon, 16 Feb 2026 22:43:24 -0500
Subject: [PATCH] xo-gc xo-cmake: simplify idl -> *.*pp codegen

---
 cmake/xo_macros/xo_cxx.cmake | 58 ++++--------------------------------
 1 file changed, 6 insertions(+), 52 deletions(-)

diff --git a/cmake/xo_macros/xo_cxx.cmake b/cmake/xo_macros/xo_cxx.cmake
index 11d3560e..1550e282 100644
--- a/cmake/xo_macros/xo_cxx.cmake
+++ b/cmake/xo_macros/xo_cxx.cmake
@@ -1677,9 +1677,6 @@ function(xo_add_genfacet)
         TARGET              # Name for this generation target
         FACET               # facet name
         INPUT               # Input .json5 file
-        OUTPUT_HPP_DIR      # Directory for .hpp files
-        OUTPUT_IMPL_SUBDIR  # Subdirectory name for impl headers
-        OUTPUT_CPP_DIR      # Directory for .cpp files
     )
     set(multiValueArgs "")
 
@@ -1693,41 +1690,18 @@ function(xo_add_genfacet)
     if(NOT DEFINED GF_FACET)
         message(FATAL_ERROR "xo_add_genfacet: FACET is required")
     endif()
-    if(NOT DEFINED GF_OUTPUT_HPP_DIR)
-        message(FATAL_ERROR "xo_add_genfacet: OUTPUT_HPP_DIR is required")
-    endif()
-    if(NOT DEFINED GF_OUTPUT_IMPL_SUBDIR)
-        message(FATAL_ERROR "xo_add_genfacet: OUTPUT_IMPL_SUBDIR is required")
-    endif()
     find_program(GENFACET_EXECUTABLE NAMES genfacet
         HINTS ${CMAKE_SOURCE_DIR}/xo-facet/codegen
         DOC "path to xo genfacet code generator"
         REQUIRED)
     message(STATUS "GENFACET_EXECUTABLE=${GENFACET_EXECUTABLE}")
 
-    set(generatedFiles
-        ${GF_OUTPUT_HPP_DIR}/${GF_FACET}.hpp
-        ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/A${GF_FACET}.hpp
-        ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/I${GF_FACET}_Any.hpp
-        ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/I${GF_FACET}_Xfer.hpp
-        ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/R${GF_FACET}.hpp)
-
-    set(_output_cpp_args "")
-    if(DEFINED GF_OUTPUT_CPP_DIR)
-        list(APPEND generatedFiles ${GF_OUTPUT_CPP_DIR}/I${GF_FACET}_Any.cpp)
-        set(_output_cpp_args --output-cpp ${GF_OUTPUT_CPP_DIR})
-    endif()
-
     #message(STATUS "generatedFiles=${generatedFiles}")
 
     # Build the genfacet command
     add_custom_command(
-        OUTPUT ${generatedFiles}
-        COMMAND ${GENFACET_EXECUTABLE}
-            --input ${GF_INPUT}
-            --output-hpp ${GF_OUTPUT_HPP_DIR}
-            --output-impl-hpp ${GF_OUTPUT_IMPL_SUBDIR}
-            ${_output_cpp_args}
+        OUTPUT ${GF_INPUT}.out
+        COMMAND ${GENFACET_EXECUTABLE} --input ${GF_INPUT}
         DEPENDS ${GF_INPUT}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Generating facet source files from ${GF_INPUT}"
@@ -1735,7 +1709,7 @@ function(xo_add_genfacet)
     )
 
     # Create a target for this generation
-    add_custom_target(${GF_TARGET} DEPENDS ${generatedFiles})
+    add_custom_target(${GF_TARGET} DEPENDS ${GF_INPUT})
 
     set_property(DIRECTORY APPEND PROPERTY XO_GENFACET_TARGETS ${GF_TARGET})
 endfunction()
@@ -1770,12 +1744,6 @@ function(xo_add_genfacetimpl)
     if(NOT DEFINED GF_INPUT)
         message(FATAL_ERROR "xo_add_genfacetimpl: INPUT is required")
     endif()
-    if(NOT DEFINED GF_OUTPUT_HPP_DIR)
-        message(FATAL_ERROR "xo_add_genfacetimpl: OUTPUT_HPP_DIR is required")
-    endif()
-    if(NOT DEFINED GF_OUTPUT_IMPL_SUBDIR)
-        message(FATAL_ERROR "xo_add_genfacetimpl: OUTPUT_IMPL_SUBDIR is required")
-    endif()
     if(NOT DEFINED GF_FACET_DIR)
         if (NOT DEFINED GF_FACET_PKG)
             message(FATAL_ERROR "xo_add_genfacetimpl: FACET_PKG or FACET_DIR required")
@@ -1791,26 +1759,12 @@ function(xo_add_genfacetimpl)
         REQUIRED)
     message(STATUS "GENFACET_EXECUTABLE=${GENFACET_EXECUTABLE}")
 
-    set(generatedFiles
-        ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/I${GF_FACET}_D${GF_REPR}.hpp)
-
-    set(_output_cpp_args "")
-    if(DEFINED GF_OUTPUT_CPP_DIR)
-        list(APPEND generatedFiles ${GF_OUTPUT_CPP_DIR}/I${GF_FACET}_D${GF_REPR}.cpp)
-        set(_output_cpp_args --output-cpp ${GF_OUTPUT_CPP_DIR})
-    endif()
-
     # Build the genfacet command.
     # But careful: can't have the same generated files in two different rules,
     # so need to remove overlaps here
     add_custom_command(
-        OUTPUT ${generatedFiles}
-        COMMAND ${GENFACET_EXECUTABLE}
-            --input ${GF_INPUT}
-            --facet-dir ${GF_FACET_DIR}
-            --output-hpp ${GF_OUTPUT_HPP_DIR}
-            --output-impl-hpp ${GF_OUTPUT_IMPL_SUBDIR}
-            ${_output_cpp_args}
+        OUTPUT ${GF_INPUT}.out
+        COMMAND ${GENFACET_EXECUTABLE} --input ${GF_INPUT} --facet-dir ${GF_FACET_DIR}
         DEPENDS ${GF_INPUT}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Generating facet source files from ${GF_INPUT}"
@@ -1818,7 +1772,7 @@ function(xo_add_genfacetimpl)
     )
 
     # Create a target for this generation
-    add_custom_target(${GF_TARGET} DEPENDS ${generatedFiles})
+    add_custom_target(${GF_TARGET} DEPENDS ${GF_INPUT})
 
     set_property(DIRECTORY APPEND PROPERTY XO_GENFACET_TARGETS ${GF_TARGET})
 endfunction()