diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-12-15 06:11:31 -0800 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-04-17 18:50:12 +0000 |
| commit | 1ea3f66e8bd050e750b7298da96b1794c18c5cb0 (patch) | |
| tree | c8c507ed090fff44460e919f8db552fb34f63953 /import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch | |
| parent | d4c38485c92b4f8425f0beee869d7a0eb6d940c8 (diff) | |
| download | talos-openbmc-1ea3f66e8bd050e750b7298da96b1794c18c5cb0.tar.gz talos-openbmc-1ea3f66e8bd050e750b7298da96b1794c18c5cb0.zip | |
gtest, gmock: update 1.7.0 -> 1.8.0
Starting from the 1.8.0 release, GoogleTest and GoogleMock are
maintained in the same repository and released together. Update the
gtest recipe to PROVIDE gmock (and drop the gmock recipe).
Patches to add CMake install rules have been dropped (now supported
upstream).
https://github.com/google/googletest/commit/98d988deac06637364f6cd41c45c3db4a8a0b6bc
https://github.com/google/googletest/commit/7c8ac4886a7ad513430d132c446a93c6d395345a
Change-Id: I5de909fd9336f9683feb74e409c3716ec0aa2474
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 1e2491d12520d767e0e5687a9b15819fe0b6ff27)
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch')
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch b/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch deleted file mode 100644 index b8f5d6f30..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bdcbef7b8adde424ee29e7eddc3b0570cc336449 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico.cadete@awtce.be> -Date: Tue, 21 Jun 2016 10:55:38 +0200 -Subject: [PATCH 1/2] Add install command for libraries and headers - -Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be> ---- - CMakeLists.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57470c8..e969648 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,6 +73,14 @@ target_link_libraries(gtest_main gtest) - - ######################################################################## - # -+# Install rules -+install(TARGETS gtest gtest_main -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ -+######################################################################## -+# - # Samples on how to link user tests with gtest or gtest_main. - # - # They are not built by default. To build them, set the --- -2.5.0 - |
