From a480e40afe636fa94ce4150f555b0c2014bf9faa Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 20 Oct 2023 12:39:29 -0400
Subject: [PATCH] build: adopt builddir/include/xo/target in include path

---
 cmake/xo_cxx.cmake | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmake/xo_cxx.cmake b/cmake/xo_cxx.cmake
index eb9fad7f..54072862 100644
--- a/cmake/xo_cxx.cmake
+++ b/cmake/xo_cxx.cmake
@@ -65,10 +65,11 @@ macro(xo_include_headeronly_options2 target)
       ${target} INTERFACE
       $<INSTALL_INTERFACE:include>
       $<INSTALL_INTERFACE:include/xo/${target}>
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>              # e.g. for #include "indentlog/scope.hpp"
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/${target}>    # e.g. for #include "Refcounted.hpp" in refcnt/src when ${target}=refcnt [DEPRECATED]
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>                 # e.g. for #include "indentlog/scope.hpp"
+      #$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/${target}>      # e.g. for #include "Refcounted.hpp" in refcnt/src when ${target}=refcnt [DEPRECATED]
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/xo/${target}>    # e.g. for #include "TypeDescr.hpp" in reflect/src when ${target}=reflect
-      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>                      # e.g. for generated .hpp files
+      #$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>                 # e.g. for generated .hpp files
+      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/xo/${target}>    # e.g. for generated .hpp files
     )
 
     # ----------------------------------------------------------------
@@ -192,10 +193,11 @@ macro(xo_include_options2 target)
       ${target} PUBLIC
       $<INSTALL_INTERFACE:include>
       $<INSTALL_INTERFACE:include/xo/${target}>
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>              # e.g. for #include "indentlog/scope.hpp"
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/${target}>    # e.g. for #include "Refcounted.hpp" in refcnt/src [DEPRECATED]
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>                 # e.g. for #include "indentlog/scope.hpp"
+      #$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/${target}>      # e.g. for #include "Refcounted.hpp" in refcnt/src [DEPRECATED]
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/xo/${target}>    # e.g. for #include "TypeDescr.hpp" in reflect/src when ${target}=reflect
-      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>                      # e.g. for generated .hpp files
+      #$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>                 # e.g. for generated .hpp files
+      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/xo/${target}>    # e.g. for generated .hpp files
     )
 
     # ----------------------------------------------------------------