Skip to content

update Gtest requirements #34

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

Closed
wants to merge 3 commits into from
Closed

update Gtest requirements #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5cebe8
update Gtest requirements
mosfet80 Mar 31, 2025
e0a2abc
Update internal_utils.cmake
mosfet80 Apr 1, 2025
4cfafe2
Merge branch 'ament:rolling' into uniformCmake
mosfet80 Apr 23, 2025
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
6 changes: 3 additions & 3 deletions googlemock/CMakeLists.txt.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project(gmock CXX C)
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.15)

find_package(gtest_vendor REQUIRED)

Expand All @@ -13,7 +13,7 @@ include_directories(
add_library(gmock STATIC
${gtest_vendor_BASE_DIR}/src/gtest-all.cc
src/gmock-all.cc)
target_compile_features(gmock PUBLIC cxx_std_11) # Require C++11
target_compile_features(gmock PUBLIC cxx_std_17) # Require C++17

# When building with asan (i.e. using colcon build --mixin asan-gcc),
# asan itself provides a "fake" pthread that tricks the pthread
Expand All @@ -31,4 +31,4 @@ if(NOT WIN32)
endif()

add_library(gmock_main STATIC src/gmock_main.cc)
target_compile_features(gmock_main PUBLIC cxx_std_11) # Require C++11
target_compile_features(gmock_main PUBLIC cxx_std_17) # Require C++17
7 changes: 2 additions & 5 deletions googlemock/CMakeLists.txt.upstream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,11 @@ endif()
# CMake files in this project can refer to the root source directory
# as ${gmock_SOURCE_DIR} and to the root binary directory as
# ${gmock_BINARY_DIR}.
# Language "C" is required for find_package(Threads).
if (CMAKE_VERSION VERSION_LESS 3.0)
project(gmock CXX C)
else()

cmake_policy(SET CMP0048 NEW)
project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
endif()
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.15)

if (COMMAND set_up_hermetic_build)
set_up_hermetic_build()
Expand Down
6 changes: 3 additions & 3 deletions googletest/CMakeLists.txt.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
project(gtest CXX C)
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.15)

include_directories(
include
. # to find the source files included with "src/gtest*.cc"
)

add_library(gtest STATIC src/gtest-all.cc)
target_compile_features(gtest PUBLIC cxx_std_11) # Require C++11
target_compile_features(gtest PUBLIC cxx_std_17) # Require C++17

# When building with asan (i.e. using colcon build --mixin asan-gcc),
# asan itself provides a "fake" pthread that tricks the pthread
Expand All @@ -25,4 +25,4 @@ if(NOT WIN32)
endif()

add_library(gtest_main STATIC src/gtest_main.cc)
target_compile_features(gtest_main PUBLIC cxx_std_11) # Require C++11
target_compile_features(gtest_main PUBLIC cxx_std_17) # Require C++17
2 changes: 1 addition & 1 deletion googletest/cmake/internal_utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function(cxx_library_with_type name type cxx_flags)
target_link_libraries(${name} PUBLIC Threads::Threads)
endif()

target_compile_features(${name} PUBLIC cxx_std_14)
target_compile_features(${name} PUBLIC cxx_std_17)
endfunction()

########################################################################
Expand Down
Loading