p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added catkin_python_setup() lines to several packages' CMakeLists.txt file.

This commit is contained in:
Dave Hershberger 2012-09-21 20:35:12 +00:00
parent 29289cdb25
commit d15043243b
5 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/roslib/CMakeLists.txt
View File

@ -6,6 +6,8 @@ catkin_package_export(
LIBRARIES roslib LIBRARIES roslib
CFG_EXTRAS roslib-extras.cmake) CFG_EXTRAS roslib-extras.cmake)
catkin_python_setup()
find_package(Boost REQUIRED COMPONENTS thread) find_package(Boost REQUIRED COMPONENTS thread)
include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}) include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

2
tools/rosboost_cfg/CMakeLists.txt
View File

@ -3,3 +3,5 @@ project(rosboost_cfg)
find_package(catkin REQUIRED) find_package(catkin REQUIRED)
catkin_package() catkin_package()
catkin_package_export() catkin_package_export()
catkin_python_setup()

2
tools/roscreate/CMakeLists.txt
View File

@ -4,4 +4,6 @@ find_package(catkin REQUIRED)
catkin_package() catkin_package()
catkin_package_export() catkin_package_export()
catkin_python_setup()
catkin_add_nosetests(test) catkin_add_nosetests(test)

2
tools/rosmake/CMakeLists.txt
View File

@ -5,4 +5,6 @@ find_package(catkin REQUIRED)
catkin_package() catkin_package()
catkin_package_export() catkin_package_export()
catkin_python_setup()
catkin_add_nosetests(test) catkin_add_nosetests(test)

4
tools/rosunit/CMakeLists.txt
View File

@ -4,6 +4,8 @@ find_package(catkin REQUIRED)
catkin_package() catkin_package()
catkin_package_export(CFG_EXTRAS ${PROJECT_NAME}-extras.cmake) catkin_package_export(CFG_EXTRAS ${PROJECT_NAME}-extras.cmake)
catkin_python_setup()
install(PROGRAMS install(PROGRAMS
scripts/test_results_dir.py scripts/test_results_dir.py
scripts/summarize_results.py scripts/summarize_results.py
@ -11,6 +13,6 @@ install(PROGRAMS
scripts/pycoverage_to_html.py scripts/pycoverage_to_html.py
scripts/clean_junit_xml.py scripts/clean_junit_xml.py
scripts/check_test_ran.py scripts/check_test_ran.py
DESTINATION share/rosunit/scripts) DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts)
catkin_add_nosetests(test) catkin_add_nosetests(test)