diff options
| author | gatecat <gatecat@ds0.me> | 2021-10-17 19:02:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 19:02:25 +0100 |
| commit | 3b99db294f95d7da8160efd6d67ebfd50ca9ef0f (patch) | |
| tree | 851775972a355cb0fbddc23b06b637d7a590771d | |
| parent | 6bd1ab41b77e3d038398ee6f2c5ba0dc46ef01c2 (diff) | |
| parent | d90de7f696bb9bdcaa5709e7626ec597767c0034 (diff) | |
| download | nextpnr-3b99db294f95d7da8160efd6d67ebfd50ca9ef0f.tar.gz nextpnr-3b99db294f95d7da8160efd6d67ebfd50ca9ef0f.tar.bz2 nextpnr-3b99db294f95d7da8160efd6d67ebfd50ca9ef0f.zip | |
Merge pull request #848 from galibert/master
mistral: Support the new routes-to-bin intermediate tool generation
| -rw-r--r-- | .github/workflows/mistral_ci.yml | 2 | ||||
| -rw-r--r-- | mistral/family.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/mistral_ci.yml b/.github/workflows/mistral_ci.yml index ca3ceb11..e48b2d44 100644 --- a/.github/workflows/mistral_ci.yml +++ b/.github/workflows/mistral_ci.yml @@ -21,7 +21,7 @@ jobs: - name: Execute build nextpnr env: MISTRAL_PATH: ${{ github.workspace }}/deps/mistral - MISTRAL_REVISION: b5bd534444364688a57e4c0f99af1bb4037a495a + MISTRAL_REVISION: 8f78291541df10d70fde6c9c58765c437807c68d run: | source ./.github/ci/build_mistral.sh get_dependencies diff --git a/mistral/family.cmake b/mistral/family.cmake index 80b67e63..4f135391 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -1,6 +1,7 @@ set(MISTRAL_ROOT "" CACHE STRING "Mistral install path") set(MISTRAL_DONT_INSTALL ON) +add_subdirectory(${MISTRAL_ROOT}/routes-to-bin ${CMAKE_CURRENT_BINARY_DIR}/routes-to-bin) add_subdirectory(${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistral) find_package(LibLZMA REQUIRED) |