diff options
author | YRabbit <rabbit@yrabbit.cyou> | 2021-12-12 07:43:14 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-12 07:43:14 +1000 |
commit | ecf3027a4de2427101ccf843fbd92b311abb5b69 (patch) | |
tree | 82aea24c3f56a2a3d4abc1ad35abd37c2d0c42c5 | |
parent | e0ab7bf6c16953e5cf688b7e4bfffe99e937c072 (diff) | |
parent | 62fcf944f9698dd4117443c239842ef1c6ef2242 (diff) | |
download | nextpnr-ecf3027a4de2427101ccf843fbd92b311abb5b69.tar.gz nextpnr-ecf3027a4de2427101ccf843fbd92b311abb5b69.tar.bz2 nextpnr-ecf3027a4de2427101ccf843fbd92b311abb5b69.zip |
Merge branch 'YosysHQ:master' into ALU-head-at-zero
-rw-r--r-- | .github/workflows/mistral_ci.yml | 2 | ||||
-rw-r--r-- | gui/mistral/family.cmake | 2 | ||||
-rw-r--r-- | mistral/family.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/mistral_ci.yml b/.github/workflows/mistral_ci.yml index 96900543..afbb2ffd 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: ea9691a720cc5695eab2fc580172be5c9e592760 + MISTRAL_REVISION: ecd413421b3b559fc63db13da30275fcd5cd3881 run: | source ./.github/ci/build_mistral.sh get_dependencies diff --git a/gui/mistral/family.cmake b/gui/mistral/family.cmake index c78ff6c1..072fa5cd 100644 --- a/gui/mistral/family.cmake +++ b/gui/mistral/family.cmake @@ -1 +1 @@ -target_include_directories(gui_mistral PRIVATE ${MISTRAL_ROOT}/libmistral ${CMAKE_BINARY_DIR}/libmistral) +target_include_directories(gui_mistral PRIVATE ${MISTRAL_ROOT}/libmistral ${CMAKE_BINARY_DIR}/libmistral ${CMAKE_BINARY_DIR}/tools) diff --git a/mistral/family.cmake b/mistral/family.cmake index d2da396a..dcbab4ff 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -8,6 +8,6 @@ add_subdirectory(${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistr 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_include_directories(${family_target} PRIVATE ${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/tools ${CMAKE_CURRENT_BINARY_DIR}/libmistral ${LIBLZMA_INCLUDE_DIRS}) target_link_libraries(${family_target} PRIVATE mistral ${LIBLZMA_LIBRARIES}) endforeach() |