Skip to content

Commit 760bffe

Browse files
author
Mark R. Tuttle
committed
Update windows patches for github actions.
1 parent da1a665 commit 760bffe

File tree

5 files changed

+29
-54
lines changed

5 files changed

+29
-54
lines changed

.github/workflows/packages.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,9 @@ jobs:
306306
- name: Install bison and flex
307307
run: ${{env.SCRIPT_DIR}}\install-bison.bat
308308

309+
- name: Patch cbmc
310+
run: ${{env.SCRIPT_DIR}}\patch-cbmc.bat
311+
309312
- name: Build cbmc
310313
run: ${{env.SCRIPT_DIR}}\build-cbmc.bat
311314

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
2+
index 113ed3afe..6d693238a 100644
3+
--- a/src/util/CMakeLists.txt
4+
+++ b/src/util/CMakeLists.txt
5+
@@ -49,3 +49,6 @@ add_dependencies(util generate_version_cpp)
6+
generic_includes(util)
7+
8+
target_link_libraries(util big-int langapi)
9+
+if(WIN32)
10+
+ target_link_libraries(util dbghelp)
11+
+endif()
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/goto-cc/CMakeLists.txt b/src/goto-cc/CMakeLists.txt
2+
index 36b448886..ff85f6130 100644
3+
--- a/src/goto-cc/CMakeLists.txt
4+
+++ b/src/goto-cc/CMakeLists.txt
5+
@@ -28,7 +28,7 @@ target_link_libraries(goto-cc goto-cc-lib)
6+
7+
if(WIN32)
8+
set_target_properties(goto-cc PROPERTIES OUTPUT_NAME goto-cl)
9+
- install(TARGETS goto-cl DESTINATION ${CMAKE_INSTALL_BINDIR})
10+
+ install(TARGETS goto-cc DESTINATION ${CMAKE_INSTALL_BINDIR})
11+
else()
12+
add_custom_command(TARGET goto-cc
13+
POST_BUILD

.github/workflows/vs2019/cbmc.patch

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/vs2019/patch-cbmc.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ REM Set up PATH to find Git Bash shell tools
44
PATH=%PATH%;"c:\Program Files\Git\usr\bin"
55

66
REM Patch CBMC with Visual Studio patches
7-
patch -p1 < .github\workflows\vs2019\cbmc.patch
8-
7+
patch -p1 < .github\workflows\vs2019\cbmc-install.patch
8+
patch -p1 < .github\workflows\vs2019\cbmc-dbghelp.patch

0 commit comments

Comments
 (0)