Skip to content

remove libopenfpgacapnproto dependency to fix github CI issue #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2024
Merged

remove libopenfpgacapnproto dependency to fix github CI issue #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,21 @@ message(STATUS "NOTE: COPYING/PATCHING OpenFPGA CMakefiles..")
set(DIFF_FILE ${PATCH_DIR}/CMAKE_fix/PATCHED_OpenFPGA/libs_cmakefile.diff)
apply_patch(${DIFF_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/libs "OpenFPGA/libs CMakefile")

set(DIFF_FILE ${PATCH_DIR}/CMAKE_fix/PATCHED_OpenFPGA/openfpga_src_CMakefile.diff)
apply_patch(${DIFF_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/openfpga "OpenFPGA/openfpga CMakefile")

file(COPY
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.capnp
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.capnp.c++
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.capnp.h
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx_capnp.h
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx_capnp_impl.h
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.cpp
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx.h
${PATCH_DIR}/openfpga/annotation/unique_blocks_uxsdcxx_interface.h
DESTINATION
${CMAKE_CURRENT_SOURCE_DIR}/OpenFPGA/openfpga/src/annotation)

# temporarily swithed to copying because of "partial patch" issue in Raptor build.
file(COPY
${PATCH_DIR}/CMAKE_fix/PATCHED_OpenFPGA/CMakeLists.txt
Expand Down
12 changes: 12 additions & 0 deletions include/CMAKE_fix/PATCHED_OpenFPGA/openfpga_src_CMakefile.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/openfpga/CMakeLists.txt b/openfpga/CMakeLists.txt
index f77e79139..b477e83e5 100644
--- a/openfpga/CMakeLists.txt
+++ b/openfpga/CMakeLists.txt
@@ -45,7 +45,6 @@ target_link_libraries(libopenfpga
libtileconfig
libpugixml
libvpr
- libopenfpgacapnproto
)

#Create the test executable
Loading