diff options
| -rw-r--r-- | meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-test/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 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 | |||
| 29 | src/gmock_main.cc) | 29 | src/gmock_main.cc) |
| 30 | 30 | ||
| 31 | + | 31 | + |
| 32 | +install(TARGETS gmock DESTINATION lib) | 32 | +install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 33 | +install(TARGETS gmock_main DESTINATION lib) | 33 | +install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 34 | + | 34 | + |
| 35 | ######################################################################## | 35 | ######################################################################## |
| 36 | # | 36 | # |
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 | |||
| 27 | # Project-wide settings | 27 | # Project-wide settings |
| 28 | @@ -87,7 +90,9 @@ cxx_library(gmock_main | 28 | @@ -87,7 +90,9 @@ cxx_library(gmock_main |
| 29 | 29 | ||
| 30 | install(TARGETS gmock DESTINATION lib) | 30 | install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 31 | install(TARGETS gmock_main DESTINATION lib) | 31 | install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 32 | - | 32 | - |
| 33 | +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc" | 33 | +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc" |
| 34 | + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/" | 34 | + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/" |
| 35 | +) | 35 | +) |
| 36 | ######################################################################## | 36 | ######################################################################## |
| 37 | # | 37 | # |
