From b6a7b607fd77a054493b2525a07a304147023218 Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Sun, 12 Jan 2020 21:11:56 -0800 Subject: [PATCH] Remove barrier to out-of-tree builds With this change, nextpnr can build successfully (and run correctly) using the git tree as a read-only reference. No change in behavior observed for in-tree builds. --- ecp5/family.cmake | 3 +-- 1 file changed, 1 insertion(+), 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)