summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-12-15 06:11:31 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-26 08:23:24 +0100
commit1e2491d12520d767e0e5687a9b15819fe0b6ff27 (patch)
treee0c90ec74255845041012d4087b0a11af0c8d816 /meta-oe
parentc4e9e1c9acecc9b46a9ec6fe2c123c223e9961e8 (diff)
downloadmeta-openembedded-1e2491d12520d767e0e5687a9b15819fe0b6ff27.tar.gz
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 Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch40
-rw-r--r--meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch56
-rw-r--r--meta-oe/recipes-test/gmock/gmock_1.7.0.bb23
-rw-r--r--meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch32
-rw-r--r--meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch55
-rw-r--r--meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch106
-rw-r--r--meta-oe/recipes-test/gtest/gtest_1.7.0.bb23
-rw-r--r--meta-oe/recipes-test/gtest/gtest_1.8.0.bb27
8 files changed, 133 insertions, 229 deletions
diff --git a/meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch b/meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch
deleted file mode 100644
index 0dac9981b..000000000
--- a/meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From ba0a7d65c918cb7e3f2073553c4cc7af5858ed03 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 31 Jul 2014 16:54:00 -0300
4Subject: [PATCH] cmake: Add install command for libraries and headers
5Organization: O.S. Systems Software LTDA.
6
7Upstream-Status: Inappropriate [embedded specific]
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10---
11 CMakeLists.txt | 6 ++++++
12 1 file changed, 6 insertions(+)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 572d044..90e797a 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -63,6 +63,8 @@ include_directories("${gmock_SOURCE_DIR}/include"
19 # Test sources.
20 "${gtest_SOURCE_DIR}")
21
22+install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock DESTINATION include)
23+
24 ########################################################################
25 #
26 # Defines the gmock & gmock_main libraries. User tests should link
27@@ -82,6 +84,10 @@ cxx_library(gmock_main
28 src/gmock-all.cc
29 src/gmock_main.cc)
30
31+
32+install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR})
33+install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR})
34+
35 ########################################################################
36 #
37 # Google Mock's own tests.
38--
391.9.1
40
diff --git a/meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch b/meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch
deleted file mode 100644
index 8ffe1a6a1..000000000
--- a/meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 45661183a7c78d8c4f75adcf53c6ddd663dc8b2d Mon Sep 17 00:00:00 2001
2From: Mario Domenech Goulart <mario@ossystems.com.br>
3Date: Mon, 20 Oct 2014 17:12:58 -0200
4Subject: [PATCH] CMakeLists, gmock.pc.in: Add pkg-config support
5Organization: O.S. Systems Software LTDA.
6
7Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
8---
9 CMakeLists.txt | 7 ++++++-
10 gmock.pc.in | 9 +++++++++
11 2 files changed, 15 insertions(+), 1 deletion(-)
12 create mode 100644 gmock.pc.in
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 90e797a..98fd824 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -27,6 +27,9 @@ if (COMMAND pre_project_set_up_hermetic_build)
19 pre_project_set_up_hermetic_build()
20 endif()
21
22+# pkg-config support
23+configure_file("gmock.pc.in" "gmock.pc" @ONLY)
24+
25 ########################################################################
26 #
27 # Project-wide settings
28@@ -87,7 +90,9 @@ cxx_library(gmock_main
29
30 install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR})
31 install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR})
32-
33+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc"
34+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/"
35+)
36 ########################################################################
37 #
38 # Google Mock's own tests.
39diff --git a/gmock.pc.in b/gmock.pc.in
40new file mode 100644
41index 0000000..08ad8d2
42--- /dev/null
43+++ b/gmock.pc.in
44@@ -0,0 +1,9 @@
45+Name: libgmock
46+Version: 1.7.0
47+Description: Google's framework for writing C++ tests on a variety of platforms
48+
49+prefix=@CMAKE_INSTALL_PREFIX@
50+includedir=${prefix}/include
51+libdir=${prefix}/lib
52+Cflags:-I${includedir}/gmock
53+Libs: -L${libdir} -lgmock -lgmock_main
54--
551.9.1
56
diff --git a/meta-oe/recipes-test/gmock/gmock_1.7.0.bb b/meta-oe/recipes-test/gmock/gmock_1.7.0.bb
deleted file mode 100644
index a537f4c1a..000000000
--- a/meta-oe/recipes-test/gmock/gmock_1.7.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1DESCRIPTION = "Google C++ Mocking Framework"
2SECTION = "libs"
3HOMEPAGE = "http://code.google.com/p/googlemock/"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
6
7SRC_URI = "\
8 http://googlemock.googlecode.com/files/${BPN}-${PV}.zip \
9 file://cmake-Add-install-command-for-libraries-and-headers.patch \
10 file://cmake-gmock.pc.in-Add-pkg-config-support.patch \
11"
12
13SRC_URI[md5sum] = "073b984d8798ea1594f5e44d85b20d66"
14SRC_URI[sha256sum] = "26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b"
15
16inherit lib_package cmake
17
18ALLOW_EMPTY_${PN} = "1"
19ALLOW_EMPTY_${PN}-dbg = "1"
20
21RDEPENDS_${PN}-dev += "${PN}-staticdev"
22
23BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch b/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch
deleted file mode 100644
index b8f5d6f30..000000000
--- a/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From bdcbef7b8adde424ee29e7eddc3b0570cc336449 Mon Sep 17 00:00:00 2001
2From: Frederico Cadete <frederico.cadete@awtce.be>
3Date: Tue, 21 Jun 2016 10:55:38 +0200
4Subject: [PATCH 1/2] Add install command for libraries and headers
5
6Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be>
7---
8 CMakeLists.txt | 8 ++++++++
9 1 file changed, 8 insertions(+)
10
11diff --git a/CMakeLists.txt b/CMakeLists.txt
12index 57470c8..e969648 100644
13--- a/CMakeLists.txt
14+++ b/CMakeLists.txt
15@@ -73,6 +73,14 @@ target_link_libraries(gtest_main gtest)
16
17 ########################################################################
18 #
19+# Install rules
20+install(TARGETS gtest gtest_main
21+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
22+install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
23+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
24+
25+########################################################################
26+#
27 # Samples on how to link user tests with gtest or gtest_main.
28 #
29 # They are not built by default. To build them, set the
30--
312.5.0
32
diff --git a/meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch b/meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch
deleted file mode 100644
index 7a19f726f..000000000
--- a/meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 89639e76d5ee039a55004e5e910d565e6e84ed35 Mon Sep 17 00:00:00 2001
2From: Rodrigo Caimi <caimi@datacom.ind.br>
3Date: Tue, 7 Oct 2014 15:37:10 -0300
4Subject: [PATCH 2/2] CMakeLists, gtest.pc.in: Add pkg-config support to gtest
5 1.7.0
6
7Signed-off-by: Rodrigo Caimi <caimi@datacom.ind.br>
8---
9 CMakeLists.txt | 6 ++++++
10 gtest.pc.in | 9 +++++++++
11 2 files changed, 15 insertions(+)
12 create mode 100644 gtest.pc.in
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index e969648..0038826 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -29,6 +29,9 @@ if (COMMAND pre_project_set_up_hermetic_build)
19 pre_project_set_up_hermetic_build()
20 endif()
21
22+# pkg-config support
23+configure_file("gtest.pc.in" "gtest.pc" @ONLY)
24+
25 ########################################################################
26 #
27 # Project-wide settings
28@@ -78,6 +81,9 @@ install(TARGETS gtest gtest_main
29 DESTINATION ${CMAKE_INSTALL_LIBDIR})
30 install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
31 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
32+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc"
33+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/"
34+)
35
36 ########################################################################
37 #
38diff --git a/gtest.pc.in b/gtest.pc.in
39new file mode 100644
40index 0000000..52e622b
41--- /dev/null
42+++ b/gtest.pc.in
43@@ -0,0 +1,9 @@
44+Name: libgtest
45+Version: 1.7.0
46+Description: Google's framework for writing C++ tests on a variety of platforms
47+
48+prefix=@CMAKE_INSTALL_PREFIX@
49+includedir=@CMAKE_INSTALL_INCLUDEDIR@
50+libdir=@CMAKE_INSTALL_LIBDIR@
51+Cflags:-I${includedir}/gtest
52+Libs: -L${libdir} -lgtest -lgtest_main
53--
542.5.0
55
diff --git a/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch b/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch
new file mode 100644
index 000000000..4c8977b49
--- /dev/null
+++ b/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch
@@ -0,0 +1,106 @@
1From ec9256bb704e94f41407fc8ace6a580491430196 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Thu, 15 Dec 2016 04:35:41 -0800
4Subject: [PATCH] Add pkg-config support
5
6Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
7Signed-off-by: Rodrigo Caimi <caimi@datacom.ind.br>
8Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
9---
10 googlemock/CMakeLists.txt | 9 +++++++--
11 googlemock/gmock.pc.in | 9 +++++++++
12 googletest/CMakeLists.txt | 9 +++++++--
13 googletest/gtest.pc.in | 9 +++++++++
14 4 files changed, 32 insertions(+), 4 deletions(-)
15 create mode 100644 googlemock/gmock.pc.in
16 create mode 100644 googletest/gtest.pc.in
17
18diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
19index beb259a..f17e2d7 100644
20--- a/googlemock/CMakeLists.txt
21+++ b/googlemock/CMakeLists.txt
22@@ -27,6 +27,9 @@ if (COMMAND pre_project_set_up_hermetic_build)
23 pre_project_set_up_hermetic_build()
24 endif()
25
26+# pkg-config support
27+configure_file("gmock.pc.in" "gmock.pc" @ONLY)
28+
29 ########################################################################
30 #
31 # Project-wide settings
32@@ -104,9 +107,11 @@ endif()
33 #
34 # Install rules
35 install(TARGETS gmock gmock_main
36- DESTINATION lib)
37+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
38 install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
39- DESTINATION include)
40+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
41+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc"
42+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
43
44 ########################################################################
45 #
46diff --git a/googlemock/gmock.pc.in b/googlemock/gmock.pc.in
47new file mode 100644
48index 0000000..04bc0b4
49--- /dev/null
50+++ b/googlemock/gmock.pc.in
51@@ -0,0 +1,9 @@
52+Name: libgmock
53+Version: 1.8.0
54+Description: Google's framework for writing C++ tests on a variety of platforms
55+
56+prefix=@CMAKE_INSTALL_PREFIX@
57+includedir=@CMAKE_INSTALL_INCLUDEDIR@
58+libdir=@CMAKE_INSTALL_LIBDIR@
59+Cflags:-I${includedir}/gmock
60+Libs: -L${libdir} -lgmock -lgmock_main
61diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
62index 621d0f0..58aaf54 100644
63--- a/googletest/CMakeLists.txt
64+++ b/googletest/CMakeLists.txt
65@@ -34,6 +34,9 @@ if (COMMAND pre_project_set_up_hermetic_build)
66 pre_project_set_up_hermetic_build()
67 endif()
68
69+# pkg-config support
70+configure_file("gtest.pc.in" "gtest.pc" @ONLY)
71+
72 ########################################################################
73 #
74 # Project-wide settings
75@@ -103,9 +106,11 @@ endif()
76 #
77 # Install rules
78 install(TARGETS gtest gtest_main
79- DESTINATION lib)
80+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
81 install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
82- DESTINATION include)
83+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
84+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc"
85+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
86
87 ########################################################################
88 #
89diff --git a/googletest/gtest.pc.in b/googletest/gtest.pc.in
90new file mode 100644
91index 0000000..fb95152
92--- /dev/null
93+++ b/googletest/gtest.pc.in
94@@ -0,0 +1,9 @@
95+Name: libgtest
96+Version: 1.8.0
97+Description: Google's framework for writing C++ tests on a variety of platforms
98+
99+prefix=@CMAKE_INSTALL_PREFIX@
100+includedir=@CMAKE_INSTALL_INCLUDEDIR@
101+libdir=@CMAKE_INSTALL_LIBDIR@
102+Cflags:-I${includedir}/gtest
103+Libs: -L${libdir} -lgtest -lgtest_main
104--
1051.9.1
106
diff --git a/meta-oe/recipes-test/gtest/gtest_1.7.0.bb b/meta-oe/recipes-test/gtest/gtest_1.7.0.bb
deleted file mode 100644
index 5bacf6c80..000000000
--- a/meta-oe/recipes-test/gtest/gtest_1.7.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1DESCRIPTION = "Google's framework for writing C++ tests"
2HOMEPAGE = "http://code.google.com/p/googletest/"
3SECTION = "libs"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
6
7SRC_URI = "\
8 http://googletest.googlecode.com/files/${BPN}-${PV}.zip \
9 file://0001-Add-install-command-for-libraries-and-headers.patch \
10 file://0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch \
11"
12
13SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
14SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d"
15
16inherit lib_package cmake
17
18ALLOW_EMPTY_${PN} = "1"
19ALLOW_EMPTY_${PN}-dbg = "1"
20
21RDEPENDS_${PN}-dev += "${PN}-staticdev"
22
23BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-test/gtest/gtest_1.8.0.bb b/meta-oe/recipes-test/gtest/gtest_1.8.0.bb
new file mode 100644
index 000000000..483dc1f2e
--- /dev/null
+++ b/meta-oe/recipes-test/gtest/gtest_1.8.0.bb
@@ -0,0 +1,27 @@
1DESCRIPTION = "Google's framework for writing C++ tests"
2HOMEPAGE = "https://github.com/google/googletest"
3SECTION = "libs"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
6 file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
7
8PROVIDES += "gmock"
9
10SRC_URI = "\
11 https://github.com/google/googletest/archive/release-${PV}.tar.gz \
12 file://Add-pkg-config-support.patch \
13"
14
15SRC_URI[md5sum] = "16877098823401d1bf2ed7891d7dce36"
16SRC_URI[sha256sum] = "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8"
17
18S = "${WORKDIR}/googletest-release-${PV}"
19
20inherit cmake
21
22ALLOW_EMPTY_${PN} = "1"
23ALLOW_EMPTY_${PN}-dbg = "1"
24
25RDEPENDS_${PN}-dev += "${PN}-staticdev"
26
27BBCLASSEXTEND = "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 08:26:41 +0000