diff options
author | Frederico Cadete <frederico.cadete@awtce.be> | 2016-06-22 17:29:35 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-23 15:21:27 +0200 |
commit | 377d67aa7cb902d4a512c3489482fb876b1ec4cd (patch) | |
tree | c4df3cc53dc296af8c07206ee6e95906fbaf19b0 /meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch | |
parent | 5cdb839fa676ccc738c749e9f4c7679080ee9f2d (diff) | |
download | meta-openembedded-contrib-377d67aa7cb902d4a512c3489482fb876b1ec4cd.tar.gz |
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 <frederico.cadete@awtce.be>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch')
-rw-r--r-- | meta-oe/recipes-test/gtest/gtest/0001-Add-install-command-for-libraries-and-headers.patch | 32 |
1 files changed, 32 insertions, 0 deletions
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 <frederico.cadete@awtce.be> +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 <frederico.cadete@awtce.be> +--- + 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 + |