Skip to content

Commit 4cb2ab7

Browse files
authored
kokoro: linux: update to gcc-13, cmake 3.31.2 (#270)
Disable warnings for third party code in googltest and googlmock
1 parent b4ebcfa commit 4cb2ab7

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,12 @@ if(MARL_BUILD_TESTS)
356356
${MARL_GOOGLETEST_DIR}/googlemock/src/gmock-all.cc
357357
)
358358

359+
# Disable warnings for third party code
360+
set_property(SOURCE
361+
${MARL_GOOGLETEST_DIR}/googletest/src/gtest-all.cc
362+
${MARL_GOOGLETEST_DIR}/googlemock/src/gmock-all.cc
363+
APPEND PROPERTY COMPILE_OPTIONS -w)
364+
359365
set(MARL_TEST_INCLUDE_DIR
360366
${MARL_GOOGLETEST_DIR}/googletest/include/
361367
${MARL_GOOGLETEST_DIR}/googlemock/include/

kokoro/ubuntu/docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ function status {
2929
. /bin/using.sh # Declare the bash `using` function for configuring toolchains.
3030

3131
status "Setting up environment"
32-
using gcc-9 # Always update gcc so we get a newer standard library.
32+
using gcc-13 # Always update gcc so we get a newer standard library.
3333

3434
if [ "$BUILD_SYSTEM" == "cmake" ]; then
35-
using cmake-3.17.2
35+
using cmake-3.31.2
3636

3737
SRC_DIR=$(pwd)
3838
BUILD_DIR=/tmp/marl-build

0 commit comments

Comments
 (0)