aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2020-01-14 18:48:16 +0000
committerGitHub <noreply@github.com>2020-01-14 18:48:16 +0000
commit92a2109f0c906504b8b7daa95b2a88943a59460d (patch)
treecb0493ce5aa07d68fef878994256d78f72e987ab
parent4cdf002557e17b23c1b9ba2e01e51279049894a3 (diff)
parentb6a7b607fd77a054493b2525a07a304147023218 (diff)
downloadnextpnr-92a2109f0c906504b8b7daa95b2a88943a59460d.tar.gz
nextpnr-92a2109f0c906504b8b7daa95b2a88943a59460d.tar.bz2
nextpnr-92a2109f0c906504b8b7daa95b2a88943a59460d.zip
Merge pull request #380 from ldoolitt/master
Remove barrier to out-of-tree builds
-rw-r--r--ecp5/family.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/ecp5/family.cmake b/ecp5/family.cmake
index 860e648d..9cd49b35 100644
--- a/ecp5/family.cmake
+++ b/ecp5/family.cmake
@@ -21,7 +21,6 @@ if (NOT EXTERNAL_CHIPDB)
set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/trellis_import.py)
- file(MAKE_DIRECTORY ecp5/chipdbs/)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/)
add_library(ecp5_chipdb OBJECT ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/)
target_compile_definitions(ecp5_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family})
@@ -70,7 +69,7 @@ if (NOT EXTERNAL_CHIPDB)
set(PREV_DEV_CC_BBA_DB)
foreach (dev ${devices})
set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/chipdb-${dev}.cc)
- set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bba)
+ set(DEV_CC_BBA_DB ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/chipdb-${dev}.bba)
set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/constids.inc)
set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/gfx.h)
if (PREGENERATED_BBA_PATH)