gmock install fix for 64bit architectures

gmock install fix for 64bit architectures

[Mateusz Nowakowski]

[-- Attachment #1.1: Type: text/plain, Size: 204 bytes --]

Hi i found some bug in gmock receipe when target architecture is 64bit. I
attach simple fix

How to deploy this fix to jethro/kroghot and master branches ??



-- 
Pozdrawiam, Mateusz Nowakowski

[-- Attachment #1.2: Type: text/html, Size: 403 bytes --]

[-- Attachment #2: gmock.patch --]
[-- Type: text/x-patch, Size: 1773 bytes --]

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/"
 +)  
  ########################################################################
  #

Re: gmock install fix for 64bit architectures

[Khem Raj]

On Thu, Sep 29, 2016 at 7:54 AM, Mateusz Nowakowski
<mateusz.cz.nowakowski@gmail.com> wrote:
> Hi i found some bug in gmock receipe when target architecture is 64bit. I
> attach simple fix
>
> How to deploy this fix to jethro/kroghot and master branches ??
>


Please send a patch as per
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

>
>
> --
> Pozdrawiam, Mateusz Nowakowski
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>