Commit 4cb2ab7 1 parent b4ebcfa commit 4cb2ab7 Copy full SHA for 4cb2ab7
File tree 2 files changed +8
-2
lines changed
2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -356,6 +356,12 @@ if(MARL_BUILD_TESTS)
356
356
${MARL_GOOGLETEST_DIR} /googlemock/src/gmock-all .cc
357
357
)
358
358
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
+
359
365
set (MARL_TEST_INCLUDE_DIR
360
366
${MARL_GOOGLETEST_DIR} /googletest/include /
361
367
${MARL_GOOGLETEST_DIR} /googlemock/include /
Original file line number Diff line number Diff line change @@ -29,10 +29,10 @@ function status {
29
29
. /bin/using.sh # Declare the bash `using` function for configuring toolchains.
30
30
31
31
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.
33
33
34
34
if [ " $BUILD_SYSTEM " == " cmake" ]; then
35
- using cmake-3.17 .2
35
+ using cmake-3.31 .2
36
36
37
37
SRC_DIR=$( pwd)
38
38
BUILD_DIR=/tmp/marl-build
You can’t perform that action at this time.
0 commit comments