Skip to content

Commit 85d7e23

Browse files
committed
remove gtest patch
1 parent 7677609 commit 85d7e23

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

unit_tests/CMakeLists.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,6 @@ FetchContent_GetProperties(googletest)
2828
if (NOT googletest_POPULATED)
2929
FetchContent_Populate(googletest)
3030
add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
31-
32-
set(PATCH_PATH "${PROJECT_SOURCE_DIR}/cmake/gtest_a7f443b8.patch")
33-
message(STATUS "patching gtest @ ${googletest_SOURCE_DIR} with ${PATCH_PATH}")
34-
execute_process(
35-
COMMAND patch -N -p1 -i "${PATCH_PATH}"
36-
WORKING_DIRECTORY "${googletest_SOURCE_DIR}"
37-
RESULT_VARIABLE patch_result
38-
)
39-
40-
# patch exits with 1 if some hunks were skipped, or 2 for real problems.
41-
# we want to tolerate hunks being skipped in case of a partial cmake,
42-
# where the patch was already applied.
43-
# unfortunately this might consume some other errors
44-
if(patch_result GREATER 1)
45-
message(FATAL_ERROR "Failed to patch gtest for nvcc: ${patch_result}")
46-
elseif(patch_result GREATER 0)
47-
message(WARNING "Possible error while patching gtest for nvcc. This is okay if the only messages above are about ignored hunks.")
48-
endif()
49-
5031
endif()
5132

5233
# Standalone MPI smoke tests (do not use KokkosComm)

unit_tests/cmake/gtest_a7f443b8.patch

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)