From 62fc25366a38f0d701225ee091b691fff3e46ba5 Mon Sep 17 00:00:00 2001 From: Jihoon Lee Date: Thu, 22 May 2014 13:59:18 +0900 Subject: [PATCH 1/2] rocon_admin_app: CMakeLists.txt(52): error: duplicate catkin_package() and cmake cleanup --- rocon_admin_app/CMakeLists.txt | 120 --------------------------------- 1 file changed, 120 deletions(-) diff --git a/rocon_admin_app/CMakeLists.txt b/rocon_admin_app/CMakeLists.txt index 81e70a4..ccf5344 100644 --- a/rocon_admin_app/CMakeLists.txt +++ b/rocon_admin_app/CMakeLists.txt @@ -8,115 +8,8 @@ find_package(catkin REQUIRED) catkin_package() -## System dependencies are found with CMake's conventions -# find_package(Boost REQUIRED COMPONENTS system) - - -## Uncomment this if the package has a setup.py. This macro ensures -## modules and global scripts declared therein get installed -## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html catkin_python_setup() -####################################### -## Declare ROS messages and services ## -####################################### - -## Generate messages in the 'msg' folder -# add_message_files( -# FILES -# Message1.msg -# Message2.msg -# ) - -## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) - -## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs # Or other packages containing msgs -# ) - -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need -catkin_package( -# INCLUDE_DIRS include -# LIBRARIES rocon_admin_app -# CATKIN_DEPENDS other_catkin_pkg -# DEPENDS system_lib -) - -########### -## Build ## -########### - -## Specify additional locations of header files -## Your package locations should be listed before other locations -# include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) - -## Declare a cpp library -# add_library(rocon_admin_app -# src/${PROJECT_NAME}/rocon_admin_app.cpp -# ) - -## Declare a cpp executable -# add_executable(rocon_admin_app_node src/rocon_admin_app_node.cpp) - -## Add cmake target dependencies of the executable/library -## as an example, message headers may need to be generated before nodes -# add_dependencies(rocon_admin_app_node rocon_admin_app_generate_messages_cpp) - -## Specify libraries to link a library or executable target against -# target_link_libraries(rocon_admin_app_node -# ${catkin_LIBRARIES} -# ) - -############# -## Install ## -############# - -# all install targets should use catkin DESTINATION variables -# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html - -## Mark executable scripts (Python etc.) for installation -## in contrast to setup.py, you can choose the destination -# install(PROGRAMS -# scripts/my_python_script -# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark executables and/or libraries for installation -# install(TARGETS rocon_admin_app rocon_admin_app_node -# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark cpp header files for installation -# install(DIRECTORY include/${PROJECT_NAME}/ -# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} -# FILES_MATCHING PATTERN "*.h" -# PATTERN ".svn" EXCLUDE -# ) - -## Mark other files for installation (e.g. launch and bag files, etc.) -# install(FILES -# # myfile1 -# # myfile2 -# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -# ) - - install( FILES admin_app_plugin.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} @@ -129,16 +22,3 @@ install(DIRECTORY resources install(DIRECTORY ui DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) - -############# -## Testing ## -############# - -## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_rocon_admin_app.cpp) -# if(TARGET ${PROJECT_NAME}-test) -# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) -# endif() - -## Add folders to be run by python nosetests -# catkin_add_nosetests(test) From 39458fefeef05d73a3f4e179a3de6eb42a0eccfe Mon Sep 17 00:00:00 2001 From: Jihoon Lee Date: Thu, 22 May 2014 14:06:11 +0900 Subject: [PATCH 2/2] concert_conductor_graph: CMakeLists.txt(52): error: duplicate catkin_package and cleanup --- concert_conductor_graph/CMakeLists.txt | 121 ------------------------- 1 file changed, 121 deletions(-) diff --git a/concert_conductor_graph/CMakeLists.txt b/concert_conductor_graph/CMakeLists.txt index 6e02dd8..e453f89 100644 --- a/concert_conductor_graph/CMakeLists.txt +++ b/concert_conductor_graph/CMakeLists.txt @@ -7,116 +7,8 @@ project(concert_conductor_graph) find_package(catkin REQUIRED) catkin_package() - -## System dependencies are found with CMake's conventions -# find_package(Boost REQUIRED COMPONENTS system) - - -## Uncomment this if the package has a setup.py. This macro ensures -## modules and global scripts declared therein get installed -## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html catkin_python_setup() -####################################### -## Declare ROS messages and services ## -####################################### - -## Generate messages in the 'msg' folder -# add_message_files( -# FILES -# Message1.msg -# Message2.msg -# ) - -## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) - -## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs # Or other packages containing msgs -# ) - -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need -catkin_package( -# INCLUDE_DIRS include -# LIBRARIES rocon_conducctor_graph -# CATKIN_DEPENDS other_catkin_pkg -# DEPENDS system_lib -) - -########### -## Build ## -########### - -## Specify additional locations of header files -## Your package locations should be listed before other locations -# include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) - -## Declare a cpp library -# add_library(rocon_conducctor_graph -# src/${PROJECT_NAME}/rocon_conducctor_graph.cpp -# ) - -## Declare a cpp executable -# add_executable(rocon_conducctor_graph_node src/rocon_conducctor_graph_node.cpp) - -## Add cmake target dependencies of the executable/library -## as an example, message headers may need to be generated before nodes -# add_dependencies(rocon_conducctor_graph_node rocon_conducctor_graph_generate_messages_cpp) - -## Specify libraries to link a library or executable target against -# target_link_libraries(rocon_conducctor_graph_node -# ${catkin_LIBRARIES} -# ) - -############# -## Install ## -############# - -# all install targets should use catkin DESTINATION variables -# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html - -## Mark executable scripts (Python etc.) for installation -## in contrast to setup.py, you can choose the destination -# install(PROGRAMS -# scripts/my_python_script -# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark executables and/or libraries for installation -# install(TARGETS rocon_conducctor_graph rocon_conducctor_graph_node -# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) - -## Mark cpp header files for installation -# install(DIRECTORY include/${PROJECT_NAME}/ -# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} -# FILES_MATCHING PATTERN "*.h" -# PATTERN ".svn" EXCLUDE -# ) - -## Mark other files for installation (e.g. launch and bag files, etc.) -# install(FILES -# # myfile1 -# # myfile2 -# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -# ) - - install( FILES conductor_plugin.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} @@ -129,16 +21,3 @@ install(DIRECTORY resources install(DIRECTORY ui DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) - -############# -## Testing ## -############# - -## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_rocon_conducctor_graph.cpp) -# if(TARGET ${PROJECT_NAME}-test) -# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) -# endif() - -## Add folders to be run by python nosetests -# catkin_add_nosetests(test)