From 377d67aa7cb902d4a512c3489482fb876b1ec4cd Mon Sep 17 00:00:00 2001 From: Frederico Cadete Date: Wed, 22 Jun 2016 17:29:35 +0200 Subject: gtest: fix installation in multilib The installation and pkgconfig patches have to be reworked to consider the install directories from OE. Signed-off-by: Frederico Cadete Signed-off-by: Martin Jansa --- ...install-command-for-libraries-and-headers.patch | 32 +++++++++++++ ...gtest.pc.in-Add-pkg-config-support-to-gte.patch | 55 ++++++++++++++++++++++ ...gtest.pc.in-Add-pkg-config-support-to-gte.patch | 55 ---------------------- ...install-command-for-libraries-and-headers.patch | 39 --------------- meta-oe/recipes-test/gtest/gtest_1.7.0.bb | 4 +- 5 files changed, 89 insertions(+), 96 deletions(-) create mode 100644 meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch create mode 100644 meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch delete mode 100644 meta-oe/recipes-test/gtest/gtest/CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch delete mode 100644 meta-oe/recipes-test/gtest/gtest/cmake-Add-install-command-for-libraries-and-headers.patch diff --git a/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch b/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch new file mode 100644 index 0000000000..b8f5d6f304 --- /dev/null +++ b/meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch @@ -0,0 +1,32 @@ +From bdcbef7b8adde424ee29e7eddc3b0570cc336449 Mon Sep 17 00:00:00 2001 +From: Frederico Cadete +Date: Tue, 21 Jun 2016 10:55:38 +0200 +Subject: [PATCH 1/2] Add install command for libraries and headers + +Signed-off-by: Frederico Cadete +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57470c8..e969648 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,6 +73,14 @@ target_link_libraries(gtest_main gtest) + + ######################################################################## + # ++# Install rules ++install(TARGETS gtest gtest_main ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ ++######################################################################## ++# + # Samples on how to link user tests with gtest or gtest_main. + # + # They are not built by default. To build them, set the +-- +2.5.0 + diff --git a/meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch b/meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch new file mode 100644 index 0000000000..7a19f726f1 --- /dev/null +++ b/meta-oe/recipes-test/gtest/gtest/0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch @@ -0,0 +1,55 @@ +From 89639e76d5ee039a55004e5e910d565e6e84ed35 Mon Sep 17 00:00:00 2001 +From: Rodrigo Caimi +Date: Tue, 7 Oct 2014 15:37:10 -0300 +Subject: [PATCH 2/2] CMakeLists, gtest.pc.in: Add pkg-config support to gtest + 1.7.0 + +Signed-off-by: Rodrigo Caimi +--- + CMakeLists.txt | 6 ++++++ + gtest.pc.in | 9 +++++++++ + 2 files changed, 15 insertions(+) + create mode 100644 gtest.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e969648..0038826 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,6 +29,9 @@ if (COMMAND pre_project_set_up_hermetic_build) + pre_project_set_up_hermetic_build() + endif() + ++# pkg-config support ++configure_file("gtest.pc.in" "gtest.pc" @ONLY) ++ + ######################################################################## + # + # Project-wide settings +@@ -78,6 +81,9 @@ install(TARGETS gtest gtest_main + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/" ++) + + ######################################################################## + # +diff --git a/gtest.pc.in b/gtest.pc.in +new file mode 100644 +index 0000000..52e622b +--- /dev/null ++++ b/gtest.pc.in +@@ -0,0 +1,9 @@ ++Name: libgtest ++Version: 1.7.0 ++Description: Google's framework for writing C++ tests on a variety of platforms ++ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++Cflags:-I${includedir}/gtest ++Libs: -L${libdir} -lgtest -lgtest_main +-- +2.5.0 + diff --git a/meta-oe/recipes-test/gtest/gtest/CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch b/meta-oe/recipes-test/gtest/gtest/CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch deleted file mode 100644 index 1ece136b6a..0000000000 --- a/meta-oe/recipes-test/gtest/gtest/CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d4b25ce723812faf78d8ee038b7cbed00cbba682 Mon Sep 17 00:00:00 2001 -From: Rodrigo Caimi -Date: Tue, 7 Oct 2014 15:37:10 -0300 -Subject: [PATCH] CMakeLists, gtest.pc.in: Add pkg-config support to gtest - 1.7.0 - -Signed-off-by: Rodrigo Caimi ---- - CMakeLists.txt | 6 ++++++ - gtest.pc.in | 9 +++++++++ - 2 files changed, 15 insertions(+) - create mode 100644 gtest.pc.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 281c4c2..e4354a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,6 +29,9 @@ if (COMMAND pre_project_set_up_hermetic_build) - pre_project_set_up_hermetic_build() - endif() - -+# pkg-config support -+configure_file("gtest.pc.in" "gtest.pc" @ONLY) -+ - ######################################################################## - # - # Project-wide settings -@@ -75,6 +78,9 @@ target_link_libraries(gtest_main gtest) - - install(TARGETS gtest DESTINATION lib) - install(TARGETS gtest_main DESTINATION lib) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/" -+) - - ######################################################################## - # -diff --git a/gtest.pc.in b/gtest.pc.in -new file mode 100644 -index 0000000..57b1049 ---- /dev/null -+++ b/gtest.pc.in -@@ -0,0 +1,9 @@ -+Name: libgtest -+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}/gtest -+Libs: -L${libdir} -lgtest -lgtest_main --- -1.9.1 - diff --git a/meta-oe/recipes-test/gtest/gtest/cmake-Add-install-command-for-libraries-and-headers.patch b/meta-oe/recipes-test/gtest/gtest/cmake-Add-install-command-for-libraries-and-headers.patch deleted file mode 100644 index 0c160b02a9..0000000000 --- a/meta-oe/recipes-test/gtest/gtest/cmake-Add-install-command-for-libraries-and-headers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5318983562be6babeb5a6996e7dda4b31acfdba8 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Wed, 30 Jul 2014 16:49:53 -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 ---- - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57470c8..281c4c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,6 +56,8 @@ include_directories( - ${gtest_SOURCE_DIR}/include - ${gtest_SOURCE_DIR}) - -+install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest DESTINATION include) -+ - # Where Google Test's libraries can be found. - link_directories(${gtest_BINARY_DIR}/src) - -@@ -71,6 +73,9 @@ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) - cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) - target_link_libraries(gtest_main gtest) - -+install(TARGETS gtest DESTINATION lib) -+install(TARGETS gtest_main DESTINATION lib) -+ - ######################################################################## - # - # Samples on how to link user tests with gtest or gtest_main. --- -1.9.1 - diff --git a/meta-oe/recipes-test/gtest/gtest_1.7.0.bb b/meta-oe/recipes-test/gtest/gtest_1.7.0.bb index edeeab692a..5bacf6c803 100644 --- a/meta-oe/recipes-test/gtest/gtest_1.7.0.bb +++ b/meta-oe/recipes-test/gtest/gtest_1.7.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" SRC_URI = "\ http://googletest.googlecode.com/files/${BPN}-${PV}.zip \ - file://cmake-Add-install-command-for-libraries-and-headers.patch \ - file://CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch \ + file://0001-Add-install-command-for-libraries-and-headers.patch \ + file://0002-CMakeLists-gtest.pc.in-Add-pkg-config-support-to-gte.patch \ " SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7" -- cgit 1.2.3-korg