caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #795 from YosysHQ/gatecat/mistral-include-fix

Browse Source 
mistral: Include mistral generated files in include dirs
This commit is contained in:
gatecat 2021-08-15 16:20:51 +01:00 committed by GitHub
commit 4d54b62e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mistral_ci.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
- name: Execute build nextpnr
env:
MISTRAL_PATH: ${{ github.workspace }}/deps/mistral
MISTRAL_REVISION: f22b32366d5fed997130712002c8f8de40eb42fc
MISTRAL_REVISION: b5bd534444364688a57e4c0f99af1bb4037a495a
run: |
source ./.github/ci/build_mistral.sh
get_dependencies

2
gui/mistral/family.cmake
View File

@ -1 +1 @@
target_include_directories(gui_mistral PRIVATE ${MISTRAL_ROOT}/libmistral)
target_include_directories(gui_mistral PRIVATE ${MISTRAL_ROOT}/libmistral ${CMAKE_BINARY_DIR}/libmistral)

2
mistral/family.cmake
View File

@ -6,7 +6,7 @@ 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 ${LIBLZMA_INCLUDE_DIRS})
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)