* [PATCH] gmock: fixed installing pkgconfig file and libraries on x86_64 architecture
@ 2016-09-30 22:18 Mateusz Nowakowski
2016-09-30 21:42 ` Burton, Ross
0 siblings, 1 reply; 3+ messages in thread
From: Mateusz Nowakowski @ 2016-09-30 22:18 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mateusz Nowakowski <mateusz.cz.nowakowski@gmail.com>
---
.../gmock/cmake-Add-install-command-for-libraries-and-headers.patch | 4 ++--
.../gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch | 6 +++---
2 files changed, 5 insertions(+), 5 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
index 92a6393..0dac998 100644
--- 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
@@ -29,8 +29,8 @@ index 572d044..90e797a 100644
src/gmock_main.cc)
+
-+install(TARGETS gmock DESTINATION lib)
-+install(TARGETS gmock_main DESTINATION lib)
++install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
########################################################################
#
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
index aa38fe4..8ffe1a6 100644
--- 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
@@ -27,11 +27,11 @@ index 90e797a..98fd824 100644
# Project-wide settings
@@ -87,7 +90,9 @@ cxx_library(gmock_main
- install(TARGETS gmock DESTINATION lib)
- install(TARGETS gmock_main DESTINATION lib)
+ install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc"
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/"
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/"
+)
########################################################################
#
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gmock: fixed installing pkgconfig file and libraries on x86_64 architecture
2016-09-30 22:18 [PATCH] gmock: fixed installing pkgconfig file and libraries on x86_64 architecture Mateusz Nowakowski
@ 2016-09-30 21:42 ` Burton, Ross
2016-10-03 16:53 ` Mateusz Nowakowski
0 siblings, 1 reply; 3+ messages in thread
From: Burton, Ross @ 2016-09-30 21:42 UTC (permalink / raw)
To: Mateusz Nowakowski; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
On 30 September 2016 at 23:18, Mateusz Nowakowski <
mateusz.cz.nowakowski@gmail.com> wrote:
> Signed-off-by: Mateusz Nowakowski <mateusz.cz.nowakowski@gmail.com>
>
As this is for meta-oe, the patch should go to
openembedded-devel@lists.openembedded.org.
Thanks,
Ross
[-- Attachment #2: Type: text/html, Size: 852 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gmock: fixed installing pkgconfig file and libraries on x86_64 architecture
2016-09-30 21:42 ` Burton, Ross
@ 2016-10-03 16:53 ` Mateusz Nowakowski
0 siblings, 0 replies; 3+ messages in thread
From: Mateusz Nowakowski @ 2016-10-03 16:53 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
ok, done :)
On Fri, 2016-09-30 at 22:42 +0100, Burton, Ross wrote:
>
> On 30 September 2016 at 23:18, Mateusz Nowakowski <mateusz.cz.nowakow
> ski@gmail.com> wrote:
> > Signed-off-by: Mateusz Nowakowski <mateusz.cz.nowakowski@gmail.com>
> >
>
> As this is for meta-oe, the patch should go to openembedded-devel@lis
> ts.openembedded.org.
>
> Thanks,
> Ross
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-03 14:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-30 22:18 [PATCH] gmock: fixed installing pkgconfig file and libraries on x86_64 architecture Mateusz Nowakowski
2016-09-30 21:42 ` Burton, Ross
2016-10-03 16:53 ` Mateusz Nowakowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox