diff options
| author | gatecat <gatecat@ds0.me> | 2021-08-15 16:20:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-15 16:20:51 +0100 |
| commit | 4d54b62e635cf3ba83358cc379587c041a189b83 (patch) | |
| tree | 7772088636b0fe20718df20e06ccec2733c786e1 | |
| parent | e7db15d6a4c9b1a36d87d7ab8a56d51f578ef82a (diff) | |
| parent | f7be385230cbd6b6a030c8e159ac2cf175298c16 (diff) | |
| download | nextpnr-4d54b62e635cf3ba83358cc379587c041a189b83.tar.gz nextpnr-4d54b62e635cf3ba83358cc379587c041a189b83.tar.bz2 nextpnr-4d54b62e635cf3ba83358cc379587c041a189b83.zip | |
Merge pull request #795 from YosysHQ/gatecat/mistral-include-fix
mistral: Include mistral generated files in include dirs
| -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 bc000b46..ca3ceb11 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: f22b32366d5fed997130712002c8f8de40eb42fc + MISTRAL_REVISION: b5bd534444364688a57e4c0f99af1bb4037a495a run: | source ./.github/ci/build_mistral.sh get_dependencies diff --git a/gui/mistral/family.cmake b/gui/mistral/family.cmake index 1bc02686..c78ff6c1 100644 --- a/gui/mistral/family.cmake +++ b/gui/mistral/family.cmake @@ -1 +1 @@ -target_include_directories(gui_mistral PRIVATE ${MISTRAL_ROOT}/libmistral) +target_include_directories(gui_mistral PRIVATE ${MISTRAL_ROOT}/libmistral ${CMAKE_BINARY_DIR}/libmistral) diff --git a/mistral/family.cmake b/mistral/family.cmake index a18b5b27..80b67e63 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -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) |