Skip to content

Commit 4050e0a

Browse files
authored
Merge pull request #893 from os-fpga/remove_libopenfpgacapnproto_dependency
remove libopenfpgacapnproto dependency to fix github CI issue
2 parents bd59622 + f0e6cf1 commit 4050e0a

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,21 @@ message(STATUS "NOTE: COPYING/PATCHING OpenFPGA CMakefiles..")
214214
set(DIFF_FILE ${PATCH_DIR}/CMAKE_fix/PATCHED_OpenFPGA/libs_cmakefile.diff)
215215
apply_patch(${DIFF_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/libs "OpenFPGA/libs CMakefile")
216216

217+
set(DIFF_FILE ${PATCH_DIR}/CMAKE_fix/PATCHED_OpenFPGA/openfpga_src_CMakefile.diff)
218+
apply_patch(${DIFF_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/openfpga "OpenFPGA/openfpga CMakefile")
219+
220+
file(COPY
221+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.capnp
222+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.capnp.c++
223+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.capnp.h
224+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx_capnp.h
225+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx_capnp_impl.h
226+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.cpp
227+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.h
228+
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx_interface.h
229+
DESTINATION
230+
${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/openfpga/src/annotation)
231+
217232
# temporarily swithed to copying because of "partial patch" issue in Raptor build.
218233
file(COPY
219234
${PATCH_DIR}/CMAKE_fix/PATCHED_OpenFPGA/CMakeLists.txt
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/openfpga/CMakeLists.txt b/openfpga/CMakeLists.txt
2+
index f77e79139..b477e83e5 100644
3+
--- a/openfpga/CMakeLists.txt
4+
+++ b/openfpga/CMakeLists.txt
5+
@@ -45,7 +45,6 @@ target_link_libraries(libopenfpga
6+
libtileconfig
7+
libpugixml
8+
libvpr
9+
- libopenfpgacapnproto
10+
)
11+
12+
#Create the test executable

0 commit comments

Comments
 (0)