Skip to content

Commit dbd10b3

Browse files
committed
Update gtest used to v1.15.2
1 parent 9b5f4c5 commit dbd10b3

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ jobs:
846846
../
847847
fi
848848
os="${{ matrix.os }}"
849-
cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
849+
cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
850850
if [[ ("${os}" == "ubuntu"*) ]]; then
851851
valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests
852852
fi

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ include_directories(BEFORE SYSTEM
324324
${CMAKE_CURRENT_SOURCE_DIR}/include
325325
)
326326

327-
#Removes flag due to issue with Google test download when LLVM_ENABLE_WERROR=On
327+
#Removes flags due to issue with Google test download when LLVM_ENABLE_WERROR=On
328328
string(REPLACE "-Wcovered-switch-default" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
329329

330330
file(STRINGS "VERSION" CPPINTEROP_VERSION)

cmake/modules/GoogleTest.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ if(WIN32)
1717
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG>)
1818
elseif(APPLE)
1919
set(EXTRA_GTEST_OPTS -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
20+
string(REPLACE "-Wc++17-attribute-extensions" "" CMAKE_CXX_FLAGS "${CMAKE_Cxx_FLAGS}")
2021
endif()
2122

2223
include(ExternalProject)
2324
ExternalProject_Add(
2425
googletest
2526
GIT_REPOSITORY https://github.com/google/googletest.git
2627
GIT_SHALLOW 1
27-
GIT_TAG release-1.12.1
28+
GIT_TAG v1.15.2
2829
UPDATE_COMMAND ""
2930
# # Force separate output paths for debug and release builds to allow easy
3031
# # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands

0 commit comments

Comments
 (0)