From d15043243b94d09790647ac59e818923f5600be6 Mon Sep 17 00:00:00 2001 From: Dave Hershberger Date: Fri, 21 Sep 2012 20:35:12 +0000 Subject: [PATCH] added catkin_python_setup() lines to several packages' CMakeLists.txt file. --- core/roslib/CMakeLists.txt | 2 ++ tools/rosboost_cfg/CMakeLists.txt | 2 ++ tools/roscreate/CMakeLists.txt | 2 ++ tools/rosmake/CMakeLists.txt | 2 ++ tools/rosunit/CMakeLists.txt | 4 +++- 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/roslib/CMakeLists.txt b/core/roslib/CMakeLists.txt index cd1f3c3c..e0e3e21e 100644 --- a/core/roslib/CMakeLists.txt +++ b/core/roslib/CMakeLists.txt @@ -6,6 +6,8 @@ catkin_package_export( LIBRARIES roslib CFG_EXTRAS roslib-extras.cmake) +catkin_python_setup() + find_package(Boost REQUIRED COMPONENTS thread) include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}) diff --git a/tools/rosboost_cfg/CMakeLists.txt b/tools/rosboost_cfg/CMakeLists.txt index 24cf9981..f9112e53 100644 --- a/tools/rosboost_cfg/CMakeLists.txt +++ b/tools/rosboost_cfg/CMakeLists.txt @@ -3,3 +3,5 @@ project(rosboost_cfg) find_package(catkin REQUIRED) catkin_package() catkin_package_export() + +catkin_python_setup() diff --git a/tools/roscreate/CMakeLists.txt b/tools/roscreate/CMakeLists.txt index de4a67fc..000cf1b6 100644 --- a/tools/roscreate/CMakeLists.txt +++ b/tools/roscreate/CMakeLists.txt @@ -4,4 +4,6 @@ find_package(catkin REQUIRED) catkin_package() catkin_package_export() +catkin_python_setup() + catkin_add_nosetests(test) diff --git a/tools/rosmake/CMakeLists.txt b/tools/rosmake/CMakeLists.txt index 1cc2a4cd..953e0c15 100644 --- a/tools/rosmake/CMakeLists.txt +++ b/tools/rosmake/CMakeLists.txt @@ -5,4 +5,6 @@ find_package(catkin REQUIRED) catkin_package() catkin_package_export() +catkin_python_setup() + catkin_add_nosetests(test) diff --git a/tools/rosunit/CMakeLists.txt b/tools/rosunit/CMakeLists.txt index 98d232de..c0fe57c1 100644 --- a/tools/rosunit/CMakeLists.txt +++ b/tools/rosunit/CMakeLists.txt @@ -4,6 +4,8 @@ find_package(catkin REQUIRED) catkin_package() catkin_package_export(CFG_EXTRAS ${PROJECT_NAME}-extras.cmake) +catkin_python_setup() + install(PROGRAMS scripts/test_results_dir.py scripts/summarize_results.py @@ -11,6 +13,6 @@ install(PROGRAMS scripts/pycoverage_to_html.py scripts/clean_junit_xml.py scripts/check_test_ran.py - DESTINATION share/rosunit/scripts) + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts) catkin_add_nosetests(test)