diff options
| author | gatecat <gatecat@ds0.me> | 2021-10-28 11:06:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 11:06:32 +0100 |
| commit | 06d58e6eed90aa9c2d16d0fe6286ec59a2f880a2 (patch) | |
| tree | acfda74458c92b61f2d5a308706fbd50af83f455 | |
| parent | 80a14592a0c4632462c61d1bd46835f2159f5ae9 (diff) | |
| parent | d51c559ab8f3bd5de2e05031e8546462ffe02119 (diff) | |
| download | nextpnr-06d58e6eed90aa9c2d16d0fe6286ec59a2f880a2.tar.gz nextpnr-06d58e6eed90aa9c2d16d0fe6286ec59a2f880a2.tar.bz2 nextpnr-06d58e6eed90aa9c2d16d0fe6286ec59a2f880a2.zip | |
Merge pull request #855 from galibert/master
mistral: Sync with yet another reorganization
| -rw-r--r-- | .github/workflows/mistral_ci.yml | 2 | ||||
| -rw-r--r-- | mistral/family.cmake | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/mistral_ci.yml b/.github/workflows/mistral_ci.yml index eb097246..96900543 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: 98ec7f69bfd5ab77e608ccd47ede988b45a7d99b + MISTRAL_REVISION: ea9691a720cc5695eab2fc580172be5c9e592760 run: | source ./.github/ci/build_mistral.sh get_dependencies diff --git a/mistral/family.cmake b/mistral/family.cmake index 4f135391..d2da396a 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -1,7 +1,8 @@ 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}/tools ${CMAKE_CURRENT_BINARY_DIR}/tools) +add_subdirectory(${MISTRAL_ROOT}/generator ${CMAKE_CURRENT_BINARY_DIR}/generator) add_subdirectory(${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistral) find_package(LibLZMA REQUIRED) @@ -9,6 +10,4 @@ find_package(LibLZMA REQUIRED) foreach(family_target ${family_targets}) target_include_directories(${family_target} PRIVATE ${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistral ${LIBLZMA_INCLUDE_DIRS}) target_link_libraries(${family_target} PRIVATE mistral ${LIBLZMA_LIBRARIES}) - # Currently required to avoid issues with mistral (LTO means the warnings can end up in nextpnr) - target_link_options(${family_target} PRIVATE -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unknown-warning-option) endforeach() |