From 11a90aff838ced1cea5c78cea8ed0c6ddcfd6cbd Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 16 Mar 2023 07:43:56 +0100
Subject: Fix out of tree builds  and place h in generated

---
 gui/machxo2/mainwindow.cc      | 2 +-
 machxo2/arch.cc                | 2 +-
 machxo2/available.h.in         | 1 -
 machxo2/family.cmake           | 4 ++--
 machxo2/machxo2_available.h.in | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 machxo2/available.h.in
 create mode 100644 machxo2/machxo2_available.h.in

diff --git a/gui/machxo2/mainwindow.cc b/gui/machxo2/mainwindow.cc
index 851caacf..4a7ffeaf 100644
--- a/gui/machxo2/mainwindow.cc
+++ b/gui/machxo2/mainwindow.cc
@@ -22,7 +22,7 @@
 #include "bitstream.h"
 #include "log.h"
 #include "embed.h"
-#include "chipdb/available.h"
+#include "machxo2_available.h"
 
 #include <QFileDialog>
 #include <QInputDialog>
diff --git a/machxo2/arch.cc b/machxo2/arch.cc
index 75566aed..e0ddd0d5 100644
--- a/machxo2/arch.cc
+++ b/machxo2/arch.cc
@@ -28,7 +28,7 @@
 #include "router1.h"
 #include "router2.h"
 #include "util.h"
-#include "chipdb/available.h"
+#include "machxo2_available.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
diff --git a/machxo2/available.h.in b/machxo2/available.h.in
deleted file mode 100644
index dce650ee..00000000
--- a/machxo2/available.h.in
+++ /dev/null
@@ -1 +0,0 @@
-static const char *available_devices = "@MACHXO2_DEVICES@";
\ No newline at end of file
diff --git a/machxo2/family.cmake b/machxo2/family.cmake
index 43b1a9b2..604c91f3 100644
--- a/machxo2/family.cmake
+++ b/machxo2/family.cmake
@@ -48,9 +48,9 @@ target_compile_options(chipdb-${family} PRIVATE -g0 -O0 -w)
 target_compile_definitions(chipdb-${family} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family})
 target_include_directories(chipdb-${family} PRIVATE ${family})
 
-configure_file(${family}/available.h.in ${family}/chipdb/available.h)
+configure_file(${family}/machxo2_available.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/machxo2_available.h)
 
 foreach(family_target ${family_targets})
     target_sources(${family_target} PRIVATE $<TARGET_OBJECTS:chipdb-${family}>)
-    target_sources(${family_target} PRIVATE ${family}/chipdb/available.h)
+    target_sources(${family_target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/generated/machxo2_available.h)
 endforeach()
diff --git a/machxo2/machxo2_available.h.in b/machxo2/machxo2_available.h.in
new file mode 100644
index 00000000..dce650ee
--- /dev/null
+++ b/machxo2/machxo2_available.h.in
@@ -0,0 +1 @@
+static const char *available_devices = "@MACHXO2_DEVICES@";
\ No newline at end of file
-- 
cgit v1.2.3