Skip to content

Commit 6ae2342

Browse files
authored
Fix
1 parent cbd9bad commit 6ae2342

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -846,9 +846,7 @@ jobs:
846846
../
847847
fi
848848
os="${{ matrix.os }}"
849-
cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }} || true
850-
cat /Users/runner/work/CppInterOp/CppInterOp/build/unittests/googletest-prefix/src/googletest-stamp/googletest-build-out.log
851-
cat /Users/runner/work/CppInterOp/CppInterOp/build/unittests/googletest-prefix/src/googletest-stamp/googletest-build-err.log
849+
cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
852850
if [[ ("${os}" == "ubuntu"*) ]]; then
853851
valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests
854852
fi

cmake/modules/GoogleTest.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ elseif(APPLE)
2020
# latest version of gtest on MacOS (use of -Wc++17-attribute-extensions causes
2121
# issues due to [[maybe_unused]] in gtest)
2222
set(EXTRA_GTEST_OPTS -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
23-
message(STATUS "CMAKE_CXX_FLAGS= ${CMAKE_CXX_FLAGS}")
2423
set(CMAKE_CXX_FLAGS_TEMP_COPY ${CMAKE_CXX_FLAGS})
2524
string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
26-
message(STATUS "CMAKE_CXX_FLAGS= ${CMAKE_CXX_FLAGS}")
2725
endif()
2826

2927
include(ExternalProject)
@@ -57,10 +55,9 @@ ExternalProject_Add(
5755
TIMEOUT 600
5856
)
5957

60-
#FIXME: Revert CMAKE_CXX_FLAGS back to include -Wall
58+
#FIXME: Related to fixme above which temporarily remodifies CMAKE_CXX_FLAGS
6159
if(APPLE)
6260
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_TEMP_COPY})
63-
message(STATUS "CMAKE_CXX_FLAGS= ${CMAKE_CXX_FLAGS}")
6461
endif()
6562

6663
# Specify include dirs for gtest and gmock

0 commit comments

Comments
 (0)