From 5b4a5d25c24cc0b73a25cf9ffde4c5428413a62f Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Wed, 27 Feb 2013 14:06:58 +0100 Subject: [PATCH] rosunit: Search rosunit in the native sysroot Cmake should search in the native sysroot for rosunit. Remove NO_CMAKE_FIND_ROOT_PATH from the find_program call to allow cmake to search in the native sysroot. Signed-off-by: Stefan Herbrechtsmeier --- ...make.em-remove-NO_CMAKE_FIND_ROOT_PA.patch | 25 +++++++++++++++++++ recipes-ros/ros/rosunit_1.9.42.bb | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch diff --git a/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch b/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch new file mode 100644 index 0000000..176a072 --- /dev/null +++ b/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch @@ -0,0 +1,25 @@ +From 2dc8c3356e38a9b6343c362f70c0cf900ed51296 Mon Sep 17 00:00:00 2001 +From: Stefan Herbrechtsmeier +Date: Thu, 21 Feb 2013 10:33:19 +0100 +Subject: [PATCH] rosunit-extras.cmake.em: remove NO_CMAKE_FIND_ROOT_PATH from find_program + +--- + tools/rosunit/cmake/rosunit-extras.cmake.em | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/rosunit/cmake/rosunit-extras.cmake.em b/tools/rosunit/cmake/rosunit-extras.cmake.em +index 4b9bb0d..30db4d1 100644 +--- a/tools/rosunit/cmake/rosunit-extras.cmake.em ++++ b/tools/rosunit/cmake/rosunit-extras.cmake.em +@@ -14,7 +14,7 @@ macro(rosunit_initialize_tests) + # find binary and scripts in installspace + find_program(ROSUNIT_EXE rosunit + PATHS @(CMAKE_INSTALL_PREFIX)/bin +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) ++ NO_DEFAULT_PATH) + if(NOT ROSUNIT_EXE) + message(FATAL_ERROR "'rosunit' not found") + endif() +-- +1.7.0.4 + diff --git a/recipes-ros/ros/rosunit_1.9.42.bb b/recipes-ros/ros/rosunit_1.9.42.bb index 3af4605..3bf8232 100644 --- a/recipes-ros/ros/rosunit_1.9.42.bb +++ b/recipes-ros/ros/rosunit_1.9.42.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc require ros.inc +SRC_URI += "file://0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch;striplevel=3" + S = "${WORKDIR}/ros-${PV}/tools/${BPN}" BBCLASSEXTEND += "native"