Skip to content

Update gtest used to v1.15.2 #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2024
+6 −2
Merged

Update gtest used to v1.15.2 #344

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54113ef
Update gtest used to v1.15.2
mcbarton Oct 28, 2024
ba69871
Remove pedantic from CXX_FLAGS Apple
mcbarton Nov 27, 2024
b631767
Remove added line
mcbarton Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cmake/modules/GoogleTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,20 @@ if(WIN32)
-Dgtest_force_shared_crt=ON
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG>)
elseif(APPLE)
#FIXME: Temporarily remove -pedantic from CMAKE_CXX_FLAGS to avoid issues with building
# latest version of gtest on MacOS (use of -Wc++17-attribute-extensions causes
# issues due to [[maybe_unused]] in gtest)
set(EXTRA_GTEST_OPTS -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
set(CMAKE_CXX_FLAGS_TEMP_COPY ${CMAKE_CXX_FLAGS})
string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Copy link
Contributor

@vgvassilev vgvassilev Nov 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if we need to propagate CMAKE_CXX_COMPILER to the CMAKE_ARGS. Alternatively in CMAKE_ARGS we can append -no-pedantic to disable the default mode.

Copy link
Contributor

@vgvassilev vgvassilev Nov 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping.

endif()

include(ExternalProject)
ExternalProject_Add(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_SHALLOW 1
GIT_TAG release-1.12.1
GIT_TAG v1.15.2
UPDATE_COMMAND ""
# # Force separate output paths for debug and release builds to allow easy
# # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
Expand All @@ -50,6 +55,11 @@ ExternalProject_Add(
TIMEOUT 600
)

#FIXME: Related to fixme above which temporarily remodifies CMAKE_CXX_FLAGS
if(APPLE)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_TEMP_COPY})
endif()

# Specify include dirs for gtest and gmock
ExternalProject_Get_Property(googletest source_dir)
set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
Expand Down
Loading