Merge pull request #516 from nosracd/bump/macos_ci

Bump macOS CI
lcm-proj · Jun 27, 2024 · 64e149f · 64e149f
2 parents e72f1ba + 7728ab8
commit 64e149f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -97,7 +97,7 @@ jobs:
   macos:
     strategy:
       matrix:
-        os: [macos-11, macos-12]
+        os: [macos-13, macos-14]
 
     runs-on: ${{ matrix.os }}
 

diff --git a/examples/cpp/lcm_log_writer/CMakeLists.txt b/examples/cpp/lcm_log_writer/CMakeLists.txt
@@ -2,6 +2,13 @@ cmake_minimum_required(VERSION 3.5)
 
 project(lcm_log_writer)
 
+# Include this directory for finding GLib2, using the file FindGLib2.cmake.
+# **WARNING** If you want to reuse this example, you will need to copy
+# FindGLib2.cmake to your new project and adjust your CMAKE_MODULE_PATH.
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake")
+
+find_package(GLib2 REQUIRED)
+
 find_package(lcm REQUIRED)
 include(${LCM_USE_FILE})
 
@@ -16,4 +23,4 @@ target_include_directories(pjs_messages-cpp INTERFACE
 
 # Create executable
 add_executable(lcm_log_writer "main.cpp")
-lcm_target_link_libraries(lcm_log_writer pjs_messages-cpp ${LCM_NAMESPACE}lcm)
+lcm_target_link_libraries(lcm_log_writer pjs_messages-cpp ${LCM_NAMESPACE}lcm-static)