From 2c7ee440462099ee89a78b2bbb8aae26445a9e46 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Mon, 15 Feb 2021 09:07:23 -0800
Subject: Move CMake logic into fpga-interchange-schema.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 3rdparty/fpga-interchange-schema |  2 +-
 fpga_interchange/family.cmake    | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/3rdparty/fpga-interchange-schema b/3rdparty/fpga-interchange-schema
index 6d450bd3..f2e62c3a 160000
--- a/3rdparty/fpga-interchange-schema
+++ b/3rdparty/fpga-interchange-schema
@@ -1 +1 @@
-Subproject commit 6d450bd3e14fdbf180f64e4f3585ec3c7427ddb3
+Subproject commit f2e62c3a0e082111d27e59699ce9caf196aa8be6
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()
-- 
cgit v1.2.3