From 2ab194cdc0bef827083dbaf3ad7727e82e97fb58 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Thu, 20 Jun 2019 11:38:55 +1000
Subject: [PATCH] build: rationalise generated header include paths

---
 CMakeLists.txt  |  5 +++--
 load/init.cpp   |  4 ++--
 load/vendor.hpp |  4 ++--
 load/vtable.cpp |  2 +-
 tools/info.cpp  | 10 +++++-----
 tools/spec.py   | 15 ++++++++-------
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7089093..e20af8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,8 @@ endif ()
 
 
 ###############################################################################
-set (GENERATED_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/cruft/vk/")
+set (GENERATED_BASE "${CMAKE_CURRENT_BINARY_DIR}/prefix")
+set (GENERATED_PREFIX "${GENERATED_BASE}/cruft/vk/")
 file (MAKE_DIRECTORY "${GENERATED_PREFIX}/load")
 file (MAKE_DIRECTORY "${GENERATED_PREFIX}/tools")
 
@@ -89,7 +90,7 @@ foreach (lib vulkan cruft-vk-load)
     target_include_directories (${lib}
         PUBLIC
             "${CMAKE_CURRENT_SOURCE_DIR}"
-            "${CMAKE_CURRENT_BINARY_DIR}"
+            "${GENERATED_PREFIX}"
             "${CMAKE_CURRENT_SOURCE_DIR}/specs/include/vulkan"
     )
 
diff --git a/load/init.cpp b/load/init.cpp
index 4151d28..8767faf 100644
--- a/load/init.cpp
+++ b/load/init.cpp
@@ -7,8 +7,8 @@
  */
 
 
-#include <cruft/vk/load/vtable.hpp>
-#include <cruft/vk/load/vendor.hpp>
+#include "load/vtable.hpp"
+#include "load/vendor.hpp"
 
 #include <vector>
 
diff --git a/load/vendor.hpp b/load/vendor.hpp
index 633633b..c72329f 100644
--- a/load/vendor.hpp
+++ b/load/vendor.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cruft/vk/vk.hpp>
-#include <cruft/vk/load/vtable.hpp>
+#include "vk.hpp"
+#include "load/vtable.hpp"
 
 #include <cruft/util/library.hpp>
 #include <cruft/util/std.hpp>
diff --git a/load/vtable.cpp b/load/vtable.cpp
index 8d92d42..2dacf82 100644
--- a/load/vtable.cpp
+++ b/load/vtable.cpp
@@ -1 +1 @@
-#include <cruft/vk/load/vtable.hpp>
+#include "load/vtable.hpp"
diff --git a/tools/info.cpp b/tools/info.cpp
index 9e5749f..6e63ccd 100644
--- a/tools/info.cpp
+++ b/tools/info.cpp
@@ -9,12 +9,12 @@
 
 #include <cruft/util/iterator/infix.hpp>
 
-#include <cruft/vk/load/ostream.hpp>
-#include <cruft/vk/load/vtable.hpp>
+#include "load/ostream.hpp"
+#include "load/vtable.hpp"
 
-#include <cruft/vk/instance.hpp>
-#include <cruft/vk/physical_device.hpp>
-#include <cruft/vk/ostream.hpp>
+#include "instance.hpp"
+#include "physical_device.hpp"
+#include "ostream.hpp"
 
 #include <iostream>
 
diff --git a/tools/spec.py b/tools/spec.py
index 19b49ca..1e5902c 100644
--- a/tools/spec.py
+++ b/tools/spec.py
@@ -802,7 +802,7 @@ def write_load(dst: TextIO, q: List[Type], reg: Registry):
     dst.write(f"""
     #pragma once
 
-    #include <cruft/vk/vk.hpp>
+    #include "vk.hpp"
 
     #include <cruft/util/preprocessor.hpp>
 
@@ -845,9 +845,9 @@ def write_load(dst: TextIO, q: List[Type], reg: Registry):
 # -----------------------------------------------------------------------------
 def write_dispatch(dst: TextIO, q: List[Type], reg: Registry):
     dst.write("""
-    #include <cruft/vk/vk.hpp>
-    #include <cruft/vk/load/vtable.hpp>
-    #include <cruft/vk/load/dispatch.hpp>
+    #include "vk.hpp"
+    #include "load/vtable.hpp"
+    #include "load/dispatch.hpp"
     
     #include <cruft/util/debug/panic.hpp>
 
@@ -993,9 +993,10 @@ def write_dispatch(dst: TextIO, q: List[Type], reg: Registry):
 
 def write_trace(dst: TextIO, q: List[Type], reg: Registry):
     dst.write("""
-        #include <cruft/vk/vk.hpp>
-        #include <cruft/vk/load/vtable.hpp>
-        #include <cruft/vk/ostream.hpp>
+        #include "vk.hpp"
+        #include "load/vtable.hpp"
+        #include "ostream.hpp"
+        
         #include <iostream>
         #include <dlfcn.h>
         #include <cstring>