diff options
| author | Marius Bakke <[email protected]> | 2022-09-29 07:26:37 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-09-29 07:26:37 +0200 |
| commit | f66067febc111d03929c95c067f0b88a8f8abb7b (patch) | |
| tree | d571997c6756f60a9e9ddd6396e46d05ca7e0dde /gnu/packages/patches/crc32c-unbundle-googletest.patch | |
| parent | 5dc5d6fa8136f067c85295d88018a7cd8b7cfe40 (diff) | |
| parent | 45eac6cdf5c8d9d7b0c564b105c790d2d2007799 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/crc32c-unbundle-googletest.patch')
| -rw-r--r-- | gnu/packages/patches/crc32c-unbundle-googletest.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/patches/crc32c-unbundle-googletest.patch b/gnu/packages/patches/crc32c-unbundle-googletest.patch new file mode 100644 index 0000000000..da513c5d4e --- /dev/null +++ b/gnu/packages/patches/crc32c-unbundle-googletest.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8490728..c7f0952 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,15 +315,7 @@ if(CRC32C_BUILD_TESTS) + set(install_gmock OFF) + + # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") +- +- # GoogleTest triggers a missing field initializers warning. +- if(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS) ++ find_package(GTest REQUIRED) + + add_executable(crc32c_tests "") + target_sources(crc32c_tests |