From 2c0970645ff03972aad987ff98ebfa399d2967c5 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 26 Dec 2025 02:18:16 -0500
Subject: [PATCH] xo-facet xo-object2 facet gen bugfixes

---
 cmake/xo_macros/xo_cxx.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmake/xo_macros/xo_cxx.cmake b/cmake/xo_macros/xo_cxx.cmake
index d491d68..ba43b34 100644
--- a/cmake/xo_macros/xo_cxx.cmake
+++ b/cmake/xo_macros/xo_cxx.cmake
@@ -1640,6 +1640,12 @@ macro(xo_add_genfacet)
 
     cmake_parse_arguments(GF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
+    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}")
+
     # Build the genfacet command
     add_custom_command(
         OUTPUT ${GF_OUTPUT_HPP_DIR}/${FACET}.hpp
@@ -1648,12 +1654,11 @@ macro(xo_add_genfacet)
             ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/I${FACET}_Xfer.hpp
             ${GF_OUTPUT_HPP_DIR}/${GF_OUTPUT_IMPL_SUBDIR}/R${FACET}.hpp
             ${GF_OUTPUT_CPP_DIR}/I${FACET}_Any.cpp
-        COMMAND ${CMAKE_SOURCE_DIR}/xo-facet/codegen/genfacet
+        COMMAND ${GENFACET_EXECUTABLE}
             --input ${GF_INPUT}
             --output-hpp ${GF_OUTPUT_HPP_DIR}
             --output-impl-hpp ${GF_OUTPUT_IMPL_SUBDIR}
             --output-cpp ${GF_OUTPUT_CPP_DIR}
-            --templates ${CMAKE_SOURCE_DIR}/xo-facet/codegen
         DEPENDS ${GF_INPUT}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Generating facet source files from ${GF_INPUT}"