fixed installing manifests for packages which did not have a CMake file and project before
This commit is contained in:
parent
653a772855
commit
0362f5ae7c
|
@ -13,23 +13,18 @@ catkin_python_setup()
|
|||
catkin_add_env_hooks(10.ros SHELLS bat sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
|
||||
|
||||
foreach(subdir
|
||||
tools/rosunit
|
||||
core/roslang
|
||||
core/roslib
|
||||
tools/rosboost_cfg
|
||||
tools/rosbash
|
||||
tools/rosclean
|
||||
tools/roscreate
|
||||
tools/rosmake
|
||||
tools/rosunit
|
||||
)
|
||||
add_subdirectory(${subdir})
|
||||
endforeach()
|
||||
|
||||
# nosetests are declared here to make them visible to the build system
|
||||
# (e.g., for Jenkins to invoke) but keep them from polluting the pristine
|
||||
# Python packages.
|
||||
find_package(catkin COMPONENTS rosunit)
|
||||
catkin_add_nosetests(core/roslib/test)
|
||||
catkin_add_nosetests(tools/rosmake/test)
|
||||
catkin_add_nosetests(tools/rosunit/test)
|
||||
catkin_add_nosetests(tools/rosclean/test)
|
||||
catkin_add_nosetests(tools/roscreate/test)
|
||||
|
||||
# INSTALLATION
|
||||
install(FILES config/rosconsole.config
|
||||
DESTINATION ${CATKIN_PROJECT_SHARE_DESTINATION}/config)
|
||||
|
@ -48,8 +43,6 @@ install(DIRECTORY core/mk/
|
|||
DESTINATION ${CATKIN_PROJECT_SHARE_DESTINATION}/core/mk
|
||||
PATTERN ".svn" EXCLUDE
|
||||
)
|
||||
install(FILES core/roslang/cmake/roslang.cmake
|
||||
DESTINATION share/roslang/cmake)
|
||||
|
||||
install(DIRECTORY tools/roscreate/templates/
|
||||
DESTINATION share/roscreate/templates
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(roslang)
|
||||
find_package(catkin REQUIRED)
|
||||
catkin_project(${PROJECT_NAME})
|
||||
|
||||
install(FILES cmake/roslang.cmake
|
||||
DESTINATION ${CATKIN_PROJECT_SHARE_DESTINATION}/cmake)
|
|
@ -1,5 +1,5 @@
|
|||
project(roslib)
|
||||
find_package(catkin REQUIRED COMPONENTS rospack rosunit)
|
||||
find_package(catkin REQUIRED COMPONENTS rospack)
|
||||
catkin_project(roslib
|
||||
LIBRARIES roslib
|
||||
INCLUDE_DIRS include
|
||||
|
@ -35,6 +35,8 @@ install(PROGRAMS scripts/gendeps
|
|||
|
||||
#integration tests
|
||||
|
||||
catkin_add_nosetests(test)
|
||||
|
||||
include_directories(${GTEST_INCLUDE_DIRS})
|
||||
link_directories(${GTEST_LIBRARY_DIRS})
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(rosboost_cfg)
|
||||
find_package(catkin REQUIRED)
|
||||
catkin_project(${PROJECT_NAME})
|
|
@ -0,0 +1,6 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(rosclean)
|
||||
find_package(catkin REQUIRED)
|
||||
catkin_project(${PROJECT_NAME})
|
||||
|
||||
catkin_add_nosetests(test)
|
|
@ -0,0 +1,6 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(roscreate)
|
||||
find_package(catkin REQUIRED)
|
||||
catkin_project(${PROJECT_NAME})
|
||||
|
||||
catkin_add_nosetests(test)
|
|
@ -0,0 +1,6 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(rosmake)
|
||||
find_package(catkin REQUIRED)
|
||||
catkin_project(${PROJECT_NAME})
|
||||
|
||||
catkin_add_nosetests(test)
|
|
@ -13,3 +13,5 @@ install(PROGRAMS
|
|||
scripts/clean_junit_xml.py
|
||||
scripts/check_test_ran.py
|
||||
DESTINATION share/rosunit/scripts)
|
||||
|
||||
catkin_add_nosetests(test)
|
||||
|
|
Loading…
Reference in New Issue