From 4061639e5b0dd64c16d1ed3812b370f7e23815b8 Mon Sep 17 00:00:00 2001
From: gavanderhoorn <g.a.vanderhoorn@tudelft.nl>
Date: Fri, 5 Oct 2018 14:23:14 +0200
Subject: [PATCH] build: make catkin_lint happy(ier).

Sort lists alphabetically, mostly.
---
 CMakeLists.txt | 67 +++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551d452..c3c60d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,19 +3,20 @@ project(ur_modern_driver)
 
 add_definitions( -DROS_BUILD )
 
-find_package(catkin REQUIRED COMPONENTS
-  hardware_interface
-  controller_manager
-  actionlib
-  control_msgs
-  geometry_msgs
-  industrial_msgs
-  roscpp
-  sensor_msgs
-  std_srvs
-  trajectory_msgs
-  ur_msgs
-  tf
+find_package(catkin REQUIRED
+  COMPONENTS
+    actionlib
+    control_msgs
+    controller_manager
+    geometry_msgs
+    hardware_interface
+    industrial_msgs
+    roscpp
+    sensor_msgs
+    std_srvs
+    tf
+    trajectory_msgs
+    ur_msgs
 )
 
 
@@ -25,12 +26,12 @@ catkin_package(
   LIBRARIES
     ur_hardware_interface
   CATKIN_DEPENDS
-    hardware_interface
-    industrial_msgs
-    controller_manager
     actionlib
     control_msgs
+    controller_manager
     geometry_msgs
+    hardware_interface
+    industrial_msgs
     roscpp
     sensor_msgs
     trajectory_msgs
@@ -40,14 +41,14 @@ catkin_package(
 
 # check c++11 / c++0x
 include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
+check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 if(COMPILER_SUPPORTS_CXX11)
-    add_compile_options(-std=c++11)
+  add_compile_options(-std=c++11)
 elseif(COMPILER_SUPPORTS_CXX0X)
-    add_compile_options(-std=c++0x)
+  add_compile_options(-std=c++0x)
 else()
-    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ")
+  message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ")
 endif()
 
 add_compile_options(-Wall)
@@ -56,7 +57,7 @@ add_compile_options(-Wno-unused-parameter)
 
 # support indigo's ros_control - This can be removed upon EOL indigo
 if("${controller_manager_msgs_VERSION}" VERSION_LESS "0.10.0")
-    add_definitions(-DUR_ROS_CONTROL_INTERFACE_OLD_ROS_CONTROL)
+  add_definitions(-DUR_ROS_CONTROL_INTERFACE_OLD_ROS_CONTROL)
 endif()
 
 include_directories(
@@ -66,27 +67,27 @@ include_directories(
 
 # Hardware Interface
 add_library(ur_hardware_interface
-  src/ros/hardware_interface.cpp
-  src/ros/controller.cpp)
+  src/ros/controller.cpp
+  src/ros/hardware_interface.cpp)
 target_link_libraries(ur_hardware_interface ${catkin_LIBRARIES})
 
 
 set(${PROJECT_NAME}_SOURCES
     src/ros/action_server.cpp
+    src/ros/lowbandwidth_trajectory_follower.cpp
     src/ros/mb_publisher.cpp
     src/ros/rt_publisher.cpp
     src/ros/service_stopper.cpp
     src/ros/trajectory_follower.cpp
-    src/ros/lowbandwidth_trajectory_follower.cpp
     src/ros/urscript_handler.cpp
-    src/ur/stream.cpp
-    src/ur/server.cpp
+    src/tcp_socket.cpp
     src/ur/commander.cpp
-    src/ur/robot_mode.cpp
     src/ur/master_board.cpp
-    src/ur/rt_state.cpp
     src/ur/messages.cpp
-    src/tcp_socket.cpp)
+    src/ur/robot_mode.cpp
+    src/ur/rt_state.cpp
+    src/ur/server.cpp
+    src/ur/stream.cpp)
 
 add_executable(ur_driver ${${PROJECT_NAME}_SOURCES} src/ros_main.cpp)
 add_dependencies(ur_driver ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
@@ -96,7 +97,7 @@ target_link_libraries(ur_driver
  )
 
 
-install(DIRECTORY launch config
+install(DIRECTORY config launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 
 install(TARGETS ur_driver ur_hardware_interface
@@ -112,9 +113,9 @@ install(DIRECTORY include/${PROJECT_NAME}/
 
 if (CATKIN_ENABLE_TESTING)
   set(${PROJECT_NAME}_TEST_SOURCES
-    tests/ur/rt_state.cpp
     tests/ur/master_board.cpp
-    tests/ur/robot_mode.cpp)
+    tests/ur/robot_mode.cpp
+    tests/ur/rt_state.cpp)
 
   catkin_add_gtest(ur_modern_driver_test ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_TEST_SOURCES} tests/main.cpp)
   target_link_libraries(ur_modern_driver_test ur_hardware_interface ${catkin_LIBRARIES})