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/Add-pkg-config-support.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/Add-pkg-config-support.patch')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch b/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch new file mode 100644 index 000000000..4c8977b49 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch @@ -0,0 +1,106 @@ +From ec9256bb704e94f41407fc8ace6a580491430196 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Thu, 15 Dec 2016 04:35:41 -0800 +Subject: [PATCH] Add pkg-config support + +Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> +Signed-off-by: Rodrigo Caimi <caimi@datacom.ind.br> +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + googlemock/CMakeLists.txt | 9 +++++++-- + googlemock/gmock.pc.in | 9 +++++++++ + googletest/CMakeLists.txt | 9 +++++++-- + googletest/gtest.pc.in | 9 +++++++++ + 4 files changed, 32 insertions(+), 4 deletions(-) + create mode 100644 googlemock/gmock.pc.in + create mode 100644 googletest/gtest.pc.in + +diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt +index beb259a..f17e2d7 100644 +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -27,6 +27,9 @@ if (COMMAND pre_project_set_up_hermetic_build) + pre_project_set_up_hermetic_build() + endif() + ++# pkg-config support ++configure_file("gmock.pc.in" "gmock.pc" @ONLY) ++ + ######################################################################## + # + # Project-wide settings +@@ -104,9 +107,11 @@ endif() + # + # Install rules + install(TARGETS gmock gmock_main +- DESTINATION lib) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock +- DESTINATION include) ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + ######################################################################## + # +diff --git a/googlemock/gmock.pc.in b/googlemock/gmock.pc.in +new file mode 100644 +index 0000000..04bc0b4 +--- /dev/null ++++ b/googlemock/gmock.pc.in +@@ -0,0 +1,9 @@ ++Name: libgmock ++Version: 1.8.0 ++Description: Google's framework for writing C++ tests on a variety of platforms ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++Cflags:-I${includedir}/gmock ++Libs: -L${libdir} -lgmock -lgmock_main +diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt +index 621d0f0..58aaf54 100644 +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -34,6 +34,9 @@ if (COMMAND pre_project_set_up_hermetic_build) + pre_project_set_up_hermetic_build() + endif() + ++# pkg-config support ++configure_file("gtest.pc.in" "gtest.pc" @ONLY) ++ + ######################################################################## + # + # Project-wide settings +@@ -103,9 +106,11 @@ endif() + # + # Install rules + install(TARGETS gtest gtest_main +- DESTINATION lib) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest +- DESTINATION include) ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + ######################################################################## + # +diff --git a/googletest/gtest.pc.in b/googletest/gtest.pc.in +new file mode 100644 +index 0000000..fb95152 +--- /dev/null ++++ b/googletest/gtest.pc.in +@@ -0,0 +1,9 @@ ++Name: libgtest ++Version: 1.8.0 ++Description: Google's framework for writing C++ tests on a variety of platforms ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++Cflags:-I${includedir}/gtest ++Libs: -L${libdir} -lgtest -lgtest_main +-- +1.9.1 + |