aboutsummaryrefslogtreecommitdiffstats
path: root/mistral/family.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'mistral/family.cmake')
-rw-r--r--mistral/family.cmake5
1 files changed, 2 insertions, 3 deletions
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()