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

[xc7] Fix test deps

Browse Source
This commit is contained in:
Eddie Hung 2018-12-29 12:28:26 -08:00
parent af0bc8ab4c
commit 0bc1587407
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xc7/family.cmake
View File

@ -15,6 +15,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules")
endif() endif()
add_dependencies(nextpnr-${family} torc) add_dependencies(nextpnr-${family} torc)
add_dependencies(nextpnr-${family}-test torc)
add_custom_target(torc ALL add_custom_target(torc ALL
COMMAND $(MAKE) > /dev/null 2> /dev/null COMMAND $(MAKE) > /dev/null 2> /dev/null
COMMENT "Building torc (may take some time...)" COMMENT "Building torc (may take some time...)"
@ -22,9 +23,8 @@ add_custom_target(torc ALL
find_package(Boost REQUIRED COMPONENTS serialization iostreams ${boost_libs} ${boost_python_lib}) find_package(Boost REQUIRED COMPONENTS serialization iostreams ${boost_libs} ${boost_python_lib})
include_directories(torc/src) include_directories(torc/src)
target_link_libraries(
nextpnr-${family} PRIVATE
set(TORC_OBJS
${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Arc.o ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Arc.o
${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/ArcUsage.o ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/ArcUsage.o
${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Array.o ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/architecture/Array.o
@ -87,3 +87,6 @@ target_link_libraries(
${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/TilewirePlaceholder.o ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/TilewirePlaceholder.o
${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/XdlExporter.o ${CMAKE_CURRENT_SOURCE_DIR}/torc/src/torc/physical/XdlExporter.o
) )
target_link_libraries(nextpnr-${family} PRIVATE ${TORC_OBJS})
target_link_libraries(nextpnr-${family}-test PRIVATE ${TORC_OBJS})