diff options
| author | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-02-15 09:07:23 -0800 |
|---|---|---|
| committer | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-02-15 09:54:58 -0800 |
| commit | 2c7ee440462099ee89a78b2bbb8aae26445a9e46 (patch) | |
| tree | 54fd3617a0c83b0c5fb81614200a06b2febc93ca | |
| parent | 6b04fd15243a3741c41ff8c775dcac064f137142 (diff) | |
| download | nextpnr-2c7ee440462099ee89a78b2bbb8aae26445a9e46.tar.gz nextpnr-2c7ee440462099ee89a78b2bbb8aae26445a9e46.tar.bz2 nextpnr-2c7ee440462099ee89a78b2bbb8aae26445a9e46.zip | |
Move CMake logic into fpga-interchange-schema.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
| m--------- | 3rdparty/fpga-interchange-schema | 0 | ||||
| -rw-r--r-- | fpga_interchange/family.cmake | 14 |
2 files changed, 1 insertions, 13 deletions
diff --git a/3rdparty/fpga-interchange-schema b/3rdparty/fpga-interchange-schema -Subproject 6d450bd3e14fdbf180f64e4f3585ec3c7427ddb +Subproject f2e62c3a0e082111d27e59699ce9caf196aa8be diff --git a/fpga_interchange/family.cmake b/fpga_interchange/family.cmake index 3f3b5a93..e62ab458 100644 --- a/fpga_interchange/family.cmake +++ b/fpga_interchange/family.cmake @@ -4,24 +4,12 @@ if(NOT ${TCL_FOUND}) endif() find_package(ZLIB REQUIRED) -find_package(CapnProto REQUIRED) -set(PROTOS LogicalNetlist.capnp PhysicalNetlist.capnp References.capnp) - -set(CAPNP_SRCS) -set(CAPNP_HDRS) -foreach (proto ${PROTOS}) - capnp_generate_cpp(CAPNP_SRC CAPNP_HDR 3rdparty/fpga-interchange-schema/interchange/${proto}) - list(APPEND CAPNP_HDRS ${CAPNP_HDR}) - list(APPEND CAPNP_SRCS ${CAPNP_SRC}) -endforeach() -add_library(fpga_interchange_capnp STATIC ${CAPNP_SRCS}) +add_subdirectory(3rdparty/fpga-interchange-schema/cmake/cxx_static) foreach (target ${family_targets}) - target_include_directories(${target} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/fpga-interchange-schema/interchange) target_include_directories(${target} PRIVATE ${TCL_INCLUDE_PATH}) target_link_libraries(${target} PRIVATE ${TCL_LIBRARY}) target_link_libraries(${target} PRIVATE fpga_interchange_capnp) - target_link_libraries(${target} PRIVATE CapnProto::capnp) target_link_libraries(${target} PRIVATE z) endforeach() |