solved all catkin_lint issues which aren't related to not installing …

…the pkg
hansonrobotics · Dec 6, 2018 · 59260b2 · 59260b2
1 parent d7867af
commit 59260b2
Show file tree

Hide file tree

Showing 29 changed files with 8 additions and 10 deletions.
diff --git a/problib/CMakeLists.txt b/problib/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(catkin REQUIRED COMPONENTS
   message_generation
   roscpp
   armadillo_matrix
-  genmsg
+  std_msgs
 )
 
 # Generate messages in the 'msg' folder
@@ -30,7 +30,7 @@ generate_messages(
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES problib
-  CATKIN_DEPENDS message_runtime armadillo_matrix
+  CATKIN_DEPENDS message_runtime armadillo_matrix std_msgs
 #  DEPENDS system_lib
 )
 

diff --git a/problib/include/problib/conversions.h b/problib/include/problib/conversions.h
diff --git a/problib/include/problib/pdfs/Gaussian.h b/problib/include/problib/pdfs/Gaussian.h
diff --git a/problib/include/problib/pdfs/Hybrid.h b/problib/include/problib/pdfs/Hybrid.h
diff --git a/problib/include/problib/pdfs/Mixture.h b/problib/include/problib/pdfs/Mixture.h
diff --git a/problib/include/problib/pdfs/PDF.h b/problib/include/problib/pdfs/PDF.h
diff --git a/problib/include/problib/pdfs/PMF.h b/problib/include/problib/pdfs/PMF.h
diff --git a/problib/include/problib/pdfs/Uniform.h b/problib/include/problib/pdfs/Uniform.h
diff --git a/problib/msg/PDF.msg b/problib/msg/PDF.msg
diff --git a/problib/msg/PDFImpl.msg b/problib/msg/PDFImpl.msg
diff --git a/problib/package.xml b/problib/package.xml
diff --git a/problib/src/pdfs/Gaussian.cpp b/problib/src/pdfs/Gaussian.cpp
diff --git a/problib/src/pdfs/Hybrid.cpp b/problib/src/pdfs/Hybrid.cpp
diff --git a/problib/src/pdfs/Mixture.cpp b/problib/src/pdfs/Mixture.cpp
diff --git a/problib/src/pdfs/PDF.cpp b/problib/src/pdfs/PDF.cpp
diff --git a/problib/src/pdfs/PMF.cpp b/problib/src/pdfs/PMF.cpp
diff --git a/problib/src/pdfs/Uniform.cpp b/problib/src/pdfs/Uniform.cpp
diff --git a/problib/src/test.cpp b/problib/src/test.cpp
diff --git a/wire_core/CMakeLists.txt b/wire_core/CMakeLists.txt
@@ -35,9 +35,8 @@ catkin_package(
 include_directories(include ${catkin_INCLUDE_DIRS} ${TinyXML_INCLUDE_DIRS})
 
 ## Build
-
-set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") # C++ 11
-set(CMAKE_CXX_FLAGS "-Wreturn-type ${CMAKE_CXX_FLAGS}") # Return type checking
+add_compile_options(-std=c++0x) # C++ 11
+add_compile_options(-Wreturn-type) # Return type checking
 
 
 add_library(wire
@@ -85,4 +84,4 @@ add_executable(wire_server src/world_model.cpp)
 target_link_libraries(wire_server wire)
 
 add_executable(dummy_publisher src/dummy_evidence_publisher.cpp) 
-target_link_libraries(dummy_publisher wire)
+target_link_libraries(dummy_publisher wire)
diff --git a/wire_core/include/wire/core/ClassModel.h b/wire_core/include/wire/core/ClassModel.h
diff --git a/wire_core/include/wire/core/Evidence.h b/wire_core/include/wire/core/Evidence.h
diff --git a/wire_core/include/wire/core/PropertySet.h b/wire_core/include/wire/core/PropertySet.h
diff --git a/wire_core/include/wire/logic/HypothesesTree.h b/wire_core/include/wire/logic/HypothesesTree.h
diff --git a/wire_core/include/wire/logic/Hypothesis.h b/wire_core/include/wire/logic/Hypothesis.h
diff --git a/wire_msgs/msg/Property.msg b/wire_msgs/msg/Property.msg
diff --git a/wire_state_estimators/include/DiscreteFilter.h b/wire_state_estimators/include/DiscreteFilter.h
diff --git a/wire_state_estimators/src/DiscreteFilter.cpp b/wire_state_estimators/src/DiscreteFilter.cpp
diff --git a/wire_tutorials/CMakeLists.txt b/wire_tutorials/CMakeLists.txt
@@ -18,7 +18,7 @@ catkin_package(
     problib
 )
 
-include_directories(include ${catkin_INCLUDE_DIRS})
+include_directories(${catkin_INCLUDE_DIRS})
 
 ## Build
 

diff --git a/wire_viz/CMakeLists.txt b/wire_viz/CMakeLists.txt
@@ -29,9 +29,8 @@ catkin_package(
 include_directories(include ${catkin_INCLUDE_DIRS})
 
 ## Build
-
-set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") # C++ 11
-set(CMAKE_CXX_FLAGS "-Wreturn-type ${CMAKE_CXX_FLAGS}") # Return type checking
+add_compile_options(-std=c++0x) # C++ 11
+add_compile_options(-Wreturn-type) # Return type checking
 
 add_library(wire_viz
     src/Visualizer.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ catkin_package( @@
         problib
     )
-    include_directories(include ${catkin_INCLUDE_DIRS})
+    include_directories(${catkin_INCLUDE_DIRS})
     ## Build
@@ Expand Down @@