diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-08-10 14:22:10 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-08-10 14:23:07 +0200 |
| commit | 9131bb78d82b71dec2d2bf255edb5f58bd2dc3f9 (patch) | |
| tree | ad9b0ebb3840f4a9b1c5a4a68f6a88608209a55f /dev-util/catkin | |
| parent | dev-ros/visp_camera_calibration: add missing usedep (diff) | |
| download | gentoo-9131bb78d82b71dec2d2bf255edb5f58bd2dc3f9.tar.gz gentoo-9131bb78d82b71dec2d2bf255edb5f58bd2dc3f9.tar.bz2 gentoo-9131bb78d82b71dec2d2bf255edb5f58bd2dc3f9.zip | |
dev-util/catkin: improve gtest/gmock search logic
Closes: https://bugs.gentoo.org/736599
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-util/catkin')
| -rw-r--r-- | dev-util/catkin/catkin-0.8.8-r1.ebuild (renamed from dev-util/catkin/catkin-0.8.8.ebuild) | 1 | ||||
| -rw-r--r-- | dev-util/catkin/catkin-9999.ebuild | 1 | ||||
| -rw-r--r-- | dev-util/catkin/files/gtest.patch | 45 |
3 files changed, 47 insertions, 0 deletions
diff --git a/dev-util/catkin/catkin-0.8.8.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild index 124af520da9c..41845cda3133 100644 --- a/dev-util/catkin/catkin-0.8.8.ebuild +++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" + "${FILESDIR}/gtest.patch" ) src_prepare() { diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index 124af520da9c..41845cda3133 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" + "${FILESDIR}/gtest.patch" ) src_prepare() { diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch new file mode 100644 index 000000000000..106b7e2886e8 --- /dev/null +++ b/dev-util/catkin/files/gtest.patch @@ -0,0 +1,45 @@ +From d9302318dece61acd0caa27d56f3817838f8f333 Mon Sep 17 00:00:00 2001 +From: seanyen <seanyen@microsoft.com> +Date: Thu, 6 Aug 2020 18:59:07 -0700 +Subject: [PATCH] Adding the new GTest search logic for Vcpkg. + +--- + cmake/test/gtest.cmake | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +Index: catkin-0.8.8/cmake/test/gtest.cmake +=================================================================== +--- catkin-0.8.8.orig/cmake/test/gtest.cmake ++++ catkin-0.8.8/cmake/test/gtest.cmake +@@ -337,6 +337,31 @@ if(TARGET gtest AND TARGET gtest_main AN + set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) + endif() + else() ++ # attempt to find the modern GTest config. ++ find_package(GTest 1.8.1 QUIET CONFIG) ++ if(GTest_FOUND AND TARGET GTest::gtest AND TARGET GTest::gtest_main) ++ set(GTEST_FOUND TRUE) ++ add_library(gtest ALIAS GTest::gtest) ++ add_library(gtest_main ALIAS GTest::gtest_main) ++ set(GTEST_INCLUDE_DIRS) ++ set(GTEST_LIBRARY_DIRS) ++ set(GTEST_LIBRARIES gtest) ++ set(GTEST_MAIN_LIBRARIES gtest_main) ++ set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) ++ endif() ++ if(GTest_FOUND AND TARGET GTest::gmock AND TARGET GTest::gmock_main) ++ set(GMOCK_FOUND TRUE) ++ add_library(gmock ALIAS GTest::gmock) ++ add_library(gmock_main ALIAS GTest::gmock_main) ++ set(GMOCK_INCLUDE_DIRS) ++ set(GMOCK_LIBRARY_DIRS) ++ set(GMOCK_LIBRARIES gmock) ++ set(GMOCK_MAIN_LIBRARIES gmock_main) ++ set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES}) ++ endif() ++endif() ++ ++if(NOT GTEST_FOUND) + find_package(GTest QUIET) + endif() + if(NOT GMOCK_FOUND OR NOT GTEST_FOUND) |