Skip to content

Commit 2ee6d95

Browse files
authored
Update gtest used to v1.15.2 (#344)
1 parent 6ab4d34 commit 2ee6d95

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,11 @@ endif()
299299

300300
# Add appropriate flags for GCC
301301
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
302-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings")
302+
if (APPLE)
303+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings")
304+
else()
305+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings")
306+
endif ()
303307
endif ()
304308

305309
# Fixes "C++ exception handler used, but unwind semantics are not enabled" warning Windows

cmake/modules/GoogleTest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ExternalProject_Add(
2424
googletest
2525
GIT_REPOSITORY https://github.com/google/googletest.git
2626
GIT_SHALLOW 1
27-
GIT_TAG release-1.12.1
27+
GIT_TAG v1.15.2
2828
UPDATE_COMMAND ""
2929
# # Force separate output paths for debug and release builds to allow easy
3030
# # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands

0 commit comments

Comments
 (0)