aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Nowakowski <mateusz.cz.nowakowski@gmail.com>2016-10-03 16:52:52 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2016-10-05 18:21:13 +0200
commit6d8cbfa5b669f82de565a302b5031fe08838cc5a (patch)
tree655d91f6737e66647ccc8b2365c5325100f00ee2
parent63707b56b5352ed72f1c5291967455b78f50fb7d (diff)
downloadmeta-openembedded-contrib-6d8cbfa5b669f82de565a302b5031fe08838cc5a.tar.gz
meta-openembedded-contrib-6d8cbfa5b669f82de565a302b5031fe08838cc5a.tar.bz2
meta-openembedded-contrib-6d8cbfa5b669f82de565a302b5031fe08838cc5a.zip
gmock: fixed installing pkgconfig file and libraries on x86_64 architecture
Signed-off-by: Mateusz Nowakowski <mateusz.cz.nowakowski@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch4
-rw-r--r--meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch6
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 92a6393655..0dac9981bf 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 aa38fe49ff..8ffe1a6a1e 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/"
+)
########################################################################
#