[oe-commits] [meta-openembedded] 14/15: gmock: fixed installing pkgconfig file and libraries on x86_64 architecture

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit 6d8cbfa5b669f82de565a302b5031fe08838cc5a
Author: Mateusz Nowakowski <mateusz.cz.nowakowski at gmail.com>
AuthorDate: Mon Oct 3 16:52:52 2016 +0000

    gmock: fixed installing pkgconfig file and libraries on x86_64 architecture
    
    Signed-off-by: Mateusz Nowakowski <mateusz.cz.nowakowski at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at 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/"
 +)  
  ########################################################################
  #

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.