Skip to content

Commit

Permalink
Updated github actions for ubuntu 24
Browse files Browse the repository at this point in the history
  • Loading branch information
julianstorer committed Jan 23, 2025
1 parent e2117f7 commit c6aa722
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cc: "gcc", cxx: "g++",
generators: "Unix Makefiles",
exe: "./choc_tests",
install_packages: "sudo apt-get update; sudo apt-get -y install libgtk-3-dev libwebkit2gtk-4.0-dev"
install_packages: "sudo apt-get update; sudo apt-get -y install libgtk-3-dev libwebkit2gtk-4.1-dev"
}
- {
name: "macOS Latest Clang",
Expand Down
4 changes: 2 additions & 2 deletions gui/choc_WebView.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ namespace choc::ui
- On OSX, you'll need to add the `WebKit` framework to your project

- On Linux, you'll need to:
1. Install the libgtk-3-dev and libwebkit2gtk-4.0-dev packages.
2. Link the gtk+3.0 and webkit2gtk-4.0 libraries in your build.
1. Install the libgtk-3-dev and libwebkit2gtk-4.1-dev packages.
2. Link the gtk+3.0 and webkit2gtk-4.1 libraries in your build.
You might want to have a look inside choc/tests/CMakeLists.txt for
an example of how to add those packages to your build without too
much fuss.
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
find_package(PkgConfig REQUIRED)
pkg_check_modules (gtk3 REQUIRED gtk+-3.0 IMPORTED_TARGET)
pkg_check_modules (webkit2 REQUIRED webkit2gtk-4.0 IMPORTED_TARGET)
pkg_check_modules (webkit2 REQUIRED webkit2gtk-4.1 IMPORTED_TARGET)
target_link_libraries (choc_tests PUBLIC pthread PkgConfig::gtk3 PkgConfig::webkit2)
endif()

Expand Down

0 comments on commit c6aa722

Please sign in to comment.