Skip to content
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.

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

Update GoogleTest to latest version #257

Merged
merged 6 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ find_package(gz-cmake3 REQUIRED)
#============================================================================
# Configure the project
#============================================================================
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(
REPLACE_IGNITION_INCLUDE_PATH gz/msgs
VERSION_SUFFIX pre1)
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ gz_create_core_library(SOURCES
${PROJECT_SOURCE_DIR}/src/Filesystem.cc
${PROJECT_SOURCE_DIR}/src/gz.cc
${PROJECT_SOURCE_DIR}/src/Utility.cc
CXX_STANDARD 17)
)

target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
Expand Down
2 changes: 1 addition & 1 deletion src/Factory_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <algorithm>
#include <cstddef>

#include "gz/msgs/test_config.h"
#include "gz/msgs/MessageTypes.hh"
#include "gz/msgs/Factory.hh"
#include "test_config.hh"

using namespace gz;

Expand Down
22 changes: 4 additions & 18 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
configure_file (test_config.hh.in
${PROJECT_BINARY_DIR}/include/test_config.hh)
include_directories (
${PROJECT_SOURCE_DIR}/test/gtest/include
${PROJECT_SOURCE_DIR}/test/gtest
${PROJECT_SOURCE_DIR}/test
${PROJECT_BINARY_DIR}/include
)

configure_file (test_config.h.in
${PROJECT_BINARY_DIR}/include/gz/msgs/test_config.h)

# Build gtest
add_library(gtest STATIC gtest/src/gtest-all.cc)
target_compile_features(gtest PUBLIC cxx_variadic_macros)
add_library(gtest_main STATIC gtest/src/gtest_main.cc)
target_link_libraries(gtest_main gtest)
set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")

execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
include_directories(${GTEST_INCLUDE_DIRS})

add_subdirectory(gtest_vendor)
add_subdirectory(integration)
add_subdirectory(performance)
add_subdirectory(regression)
280 changes: 0 additions & 280 deletions test/gtest/cmake/internal_utils.cmake

This file was deleted.

28 changes: 0 additions & 28 deletions test/gtest/gtest-20180605-98a0d007d70.diff

This file was deleted.

Loading