diff options
| author | David Shah <dave@ds0.me> | 2020-10-15 14:50:09 +0100 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2020-11-30 08:45:27 +0000 |
| commit | 901bf2bb1eeb97386fc22f6453240f61c0aa676b (patch) | |
| tree | b5a86fae56597f81b3d96d08135474af9989feb3 /nexus | |
| parent | 9affda5626e8207952076b8b12d2981e4bc8533e (diff) | |
| download | nextpnr-901bf2bb1eeb97386fc22f6453240f61c0aa676b.tar.gz nextpnr-901bf2bb1eeb97386fc22f6453240f61c0aa676b.tar.bz2 nextpnr-901bf2bb1eeb97386fc22f6453240f61c0aa676b.zip | |
nexus: Update for new monolithic prjoxide
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'nexus')
| -rw-r--r-- | nexus/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nexus/CMakeLists.txt b/nexus/CMakeLists.txt index 30796cfc..d58bd689 100644 --- a/nexus/CMakeLists.txt +++ b/nexus/CMakeLists.txt @@ -13,9 +13,9 @@ if(DEFINED NEXUS_CHIPDB) add_custom_target(chipdb-nexus-bbas ALL) else() # shared among all families - set(OXIDE_ROOT "" CACHE STRING - "prjoxide root folder") - message(STATUS "prjoxide root folder: ${OXIDE_ROOT}") + set(OXIDE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING + "prjoxide install prefix") + message(STATUS "prjoxide install prefix: ${OXIDE_INSTALL_PREFIX}") set(all_device_bbas) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/chipdb) @@ -25,15 +25,15 @@ else() endif() set(family_bba chipdb/chipdb-${subfamily}.bba) - set(BBA_TOOL ${OXIDE_ROOT}/libprjoxide/target/release/oxide_bbaexport) + set(PRJOXIDE_TOOL ${OXIDE_INSTALL_PREFIX}/bin/prjoxide) add_custom_command( OUTPUT ${family_bba} COMMAND - ${BBA_TOOL} ${subfamily} ${CMAKE_CURRENT_SOURCE_DIR}/constids.inc ${family_bba}.new + ${PRJOXIDE_TOOL} bba-export ${subfamily} ${CMAKE_CURRENT_SOURCE_DIR}/constids.inc ${family_bba}.new # atomically update COMMAND ${CMAKE_COMMAND} -E rename ${family_bba}.new ${family_bba} DEPENDS - ${BBA_TOOL} + ${PRJOXIDE_TOOL} ${CMAKE_CURRENT_SOURCE_DIR}/constids.inc ${CMAKE_CURRENT_SOURCE_DIR}/bba_version.inc ${PREVIOUS_CHIPDB_TARGET} |