diff options
Diffstat (limited to 'mistral')
| -rw-r--r-- | mistral/family.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mistral/family.cmake b/mistral/family.cmake index 552c64ae..a18b5b27 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -1,13 +1,12 @@ set(MISTRAL_ROOT "" CACHE STRING "Mistral install path") +set(MISTRAL_DONT_INSTALL ON) -aux_source_directory(${MISTRAL_ROOT}/lib MISTRAL_LIB_FILES) -add_library(mistral STATIC ${MISTRAL_LIB_FILES}) -target_compile_options(mistral PRIVATE -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unknown-warning-option) +add_subdirectory(${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistral) find_package(LibLZMA REQUIRED) foreach(family_target ${family_targets}) - target_include_directories(${family_target} PRIVATE ${MISTRAL_ROOT}/lib ${LIBLZMA_INCLUDE_DIRS}) + target_include_directories(${family_target} PRIVATE ${MISTRAL_ROOT}/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) |