diff options
| author | David Shah <dave@ds0.me> | 2020-01-16 09:12:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 09:12:56 +0000 |
| commit | 44cbc5121b431c7b24df03060f4a1cc50fa0abb0 (patch) | |
| tree | d6ddde92240cf2d7e0faed440dc0420a7e0ecff9 | |
| parent | 92a2109f0c906504b8b7daa95b2a88943a59460d (diff) | |
| parent | eba6ea53f8a03086a48a67c1b8e2a0fce4ff48c0 (diff) | |
| download | nextpnr-44cbc5121b431c7b24df03060f4a1cc50fa0abb0.tar.gz nextpnr-44cbc5121b431c7b24df03060f4a1cc50fa0abb0.tar.bz2 nextpnr-44cbc5121b431c7b24df03060f4a1cc50fa0abb0.zip | |
Merge pull request #381 from ldoolitt/master
More adjustments to .bba file locations
| -rw-r--r-- | ecp5/family.cmake | 2 | ||||
| -rw-r--r-- | ice40/family.cmake | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 9cd49b35..720fd19f 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -38,7 +38,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}.bin) - 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) diff --git a/ice40/family.cmake b/ice40/family.cmake index 2859f456..381fe96a 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -11,7 +11,6 @@ if (NOT EXTERNAL_CHIPDB) set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdb.py) set(ICEBOX_ROOT "/usr/local/share/icebox" CACHE STRING "icebox location root") - file(MAKE_DIRECTORY ice40/chipdbs/) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/) add_library(ice40_chipdb OBJECT ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/) target_compile_definitions(ice40_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) @@ -36,7 +35,7 @@ if (NOT EXTERNAL_CHIPDB) set(OPT_SLOW --slow ${ICEBOX_ROOT}/timings_lp${dev}.txt) endif() set(DEV_TXT_DB ${ICEBOX_ROOT}/chipdb-${dev}.txt) - set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bba) + set(DEV_CC_BBA_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bba) set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bin) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) @@ -82,7 +81,7 @@ if (NOT EXTERNAL_CHIPDB) set(OPT_SLOW --slow ${ICEBOX_ROOT}/timings_lp${dev}.txt) endif() set(DEV_TXT_DB ${ICEBOX_ROOT}/chipdb-${dev}.txt) - set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bba) + set(DEV_CC_BBA_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bba) set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.cc) set(DEV_BIN_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bin) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) |