diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2023-03-16 07:43:56 +0100 |
|---|---|---|
| committer | myrtle <gatecat@ds0.me> | 2023-03-16 13:37:23 +0100 |
| commit | 11a90aff838ced1cea5c78cea8ed0c6ddcfd6cbd (patch) | |
| tree | a82989b24766f9da8cc9e1466bfb1068e0674183 | |
| parent | f008d7c4d802b3806f0a1fb2dab32e73ef7ff0ed (diff) | |
| download | nextpnr-11a90aff838ced1cea5c78cea8ed0c6ddcfd6cbd.tar.gz nextpnr-11a90aff838ced1cea5c78cea8ed0c6ddcfd6cbd.tar.bz2 nextpnr-11a90aff838ced1cea5c78cea8ed0c6ddcfd6cbd.zip | |
Fix out of tree builds and place h in generated
| -rw-r--r-- | gui/machxo2/mainwindow.cc | 2 | ||||
| -rw-r--r-- | machxo2/arch.cc | 2 | ||||
| -rw-r--r-- | machxo2/family.cmake | 4 | ||||
| -rw-r--r-- | machxo2/machxo2_available.h.in (renamed from machxo2/available.h.in) | 0 |
4 files changed, 4 insertions, 4 deletions
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/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/available.h.in b/machxo2/machxo2_available.h.in index dce650ee..dce650ee 100644 --- a/machxo2/available.h.in +++ b/machxo2/machxo2_available.h.in |