helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 22:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

gmock: fixed installing pkgconfig file and libraries on x86_64 architecture

Browse Source 
Signed-off-by: Mateusz Nowakowski <mateusz.cz.nowakowski@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Mateusz Nowakowski 2016-10-03 16:52:52 +00:00 committed by Martin Jansa
parent 63707b56b5
commit 6d8cbfa5b6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch
View File

@ -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})
+
########################################################################
#

6
meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch
View File

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