diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock')
2 files changed, 0 insertions, 96 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch b/import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch deleted file mode 100644 index 0dac9981b..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock/cmake-Add-install-command-for-libraries-and-headers.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ba0a7d65c918cb7e3f2073553c4cc7af5858ed03 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Thu, 31 Jul 2014 16:54:00 -0300 -Subject: [PATCH] cmake: Add install command for libraries and headers -Organization: O.S. Systems Software LTDA. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 572d044..90e797a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,6 +63,8 @@ include_directories("${gmock_SOURCE_DIR}/include" - # Test sources. - "${gtest_SOURCE_DIR}") - -+install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock DESTINATION include) -+ - ######################################################################## - # - # Defines the gmock & gmock_main libraries. User tests should link -@@ -82,6 +84,10 @@ cxx_library(gmock_main - src/gmock-all.cc - src/gmock_main.cc) - -+ -+install(TARGETS gmock DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS gmock_main DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ - ######################################################################## - # - # Google Mock's own tests. --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch b/import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch deleted file mode 100644 index 8ffe1a6a1..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-test/gmock/gmock/cmake-gmock.pc.in-Add-pkg-config-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 45661183a7c78d8c4f75adcf53c6ddd663dc8b2d Mon Sep 17 00:00:00 2001 -From: Mario Domenech Goulart <mario@ossystems.com.br> -Date: Mon, 20 Oct 2014 17:12:58 -0200 -Subject: [PATCH] CMakeLists, gmock.pc.in: Add pkg-config support -Organization: O.S. Systems Software LTDA. - -Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> ---- - CMakeLists.txt | 7 ++++++- - gmock.pc.in | 9 +++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) - create mode 100644 gmock.pc.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90e797a..98fd824 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,6 +27,9 @@ if (COMMAND pre_project_set_up_hermetic_build) - pre_project_set_up_hermetic_build() - endif() - -+# pkg-config support -+configure_file("gmock.pc.in" "gmock.pc" @ONLY) -+ - ######################################################################## - # - # Project-wide settings -@@ -87,7 +90,9 @@ cxx_library(gmock_main - - 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_LIBDIR}/pkgconfig/" -+) - ######################################################################## - # - # Google Mock's own tests. -diff --git a/gmock.pc.in b/gmock.pc.in -new file mode 100644 -index 0000000..08ad8d2 ---- /dev/null -+++ b/gmock.pc.in -@@ -0,0 +1,9 @@ -+Name: libgmock -+Version: 1.7.0 -+Description: Google's framework for writing C++ tests on a variety of platforms -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=${prefix}/include -+libdir=${prefix}/lib -+Cflags:-I${includedir}/gmock -+Libs: -L${libdir} -lgmock -lgmock_main --- -1.9.1 - |