Merge pull request #1 from ScalABLE40/catkin_lint

Catkin lint
RVMI · Jul 4, 2019 · 4ded419 · 4ded419
2 parents 8e4d975 + 834daa3
commit 4ded419
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/skiros2_std_reasoners/CMakeLists.txt b/skiros2_std_reasoners/CMakeLists.txt
@@ -5,8 +5,6 @@ project(skiros2_std_reasoners)
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
-  rospy
-  skiros2_msgs
 )
 
 ## System dependencies are found with CMake's conventions
@@ -40,11 +38,10 @@ catkin_package(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 # include_directories(include)
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-)
 
 catkin_install_python(PROGRAMS
   test/test
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
diff --git a/skiros2_std_reasoners/package.xml b/skiros2_std_reasoners/package.xml
@@ -12,8 +12,6 @@
 
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>rospy</build_depend>
-  <build_depend>skiros2_msgs</build_depend>
   <run_depend>rospy</run_depend>
   <run_depend>skiros2_msgs</run_depend>
   <run_depend>skiros2_common</run_depend>

diff --git a/skiros2_std_skills/CMakeLists.txt b/skiros2_std_skills/CMakeLists.txt
@@ -5,8 +5,6 @@ project(skiros2_std_skills)
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
-  rospy
-  skiros2_msgs
 )
 
 ## System dependencies are found with CMake's conventions
@@ -40,10 +38,6 @@ catkin_package(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 # include_directories(include)
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-)
-
 #catkin_install_python(PROGRAMS
 #  test/test
 #  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

diff --git a/skiros2_std_skills/package.xml b/skiros2_std_skills/package.xml
@@ -12,8 +12,6 @@
 
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>rospy</build_depend>
-  <build_depend>skiros2_msgs</build_depend>
   <run_depend>rospy</run_depend>
   <run_depend>skiros2_msgs</run_depend>
   <run_depend>skiros2_common</run_depend>