[fix] CMake error & warning fixes on develop

ros/src/driveworks/packages/autoware_driveworks_gmsl_interface/CMakeLists.txt

@@ -10,26 +10,26 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64" AND CUDA_FOUND)
       set(DRIVEWORKS_LINKER_FLAGS "-Wl,-undefined,dynamic_lookup")
     endif()
 
-    add_definitions(-DVIBRANTE)
-
     find_package(catkin REQUIRED COMPONENTS
-        autoware_build_flags
-        roscpp
-        sensor_msgs
-        std_msgs
-        cv_bridge
-        image_transport
-        camera_info_manager
-        nodelet
+            autoware_build_flags
+            roscpp
+            sensor_msgs
+            std_msgs
+            cv_bridge
+            image_transport
+            camera_info_manager
+            nodelet
     )
 
     catkin_package(
-        LIBRARIES ${PROJECT_NAME}
-        CATKIN_DEPENDS
-        sensor_msgs
-        std_msgs
+            LIBRARIES ${PROJECT_NAME}
+            CATKIN_DEPENDS
+            sensor_msgs
+            std_msgs
     )
 
+    add_definitions(-DVIBRANTE)
+
     include_directories(
         include
         ${catkin_INCLUDE_DIRS}
@@ -91,5 +91,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64" AND CUDA_FOUND)
     )
 
 else()
+    find_package(catkin REQUIRED)
+    catkin_package()
     message("gmsl_camera driver will not be built. CUDA was not found.")
 endif()

ros/src/driveworks/packages/autoware_driveworks_gmsl_interface/package.xml

@@ -10,7 +10,7 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <!-- <buildtool_depend>autoware_build_flags</buildtool_depend> -->
+  <buildtool_depend>autoware_build_flags</buildtool_depend>
   <build_depend>libglew-dev</build_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>sensor_msgs</build_depend>

ros/src/simulation/lgsvl_simulator_bridge/CMakeLists.txt

@@ -1,61 +1,42 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(lgsvl_simulator_bridge)
 
-## Compile as C++11, supported in ROS Kinetic and newer
 add_compile_options(-std=c++11)
 
 find_package(catkin REQUIRED COMPONENTS
-  autoware_msgs
-  geometry_msgs
-  roscpp
-  rospy
-  roslib
-  sensor_msgs
-)
+        autoware_msgs
+        geometry_msgs
+        roscpp
+        rospy
+        roslib
+        sensor_msgs
+        )
 
-###################################
-## catkin specific configuration ##
-###################################
-## The catkin_package macro generates cmake config files for your package
-## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if your package contains header files
-## 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 lgsvl_simulator_bridge
-  CATKIN_DEPENDS autoware_msgs geometry_msgs roscpp rospy sensor_msgs
-#  DEPENDS system_lib
+        CATKIN_DEPENDS
+        autoware_msgs
+        geometry_msgs
+        roscpp
+        rospy
+        sensor_msgs
 )
 
-###########
-## Build ##
-###########
 
-## Specify additional locations of header files
-## Your package locations should be listed before other locations
 include_directories(
-  include
-  ${catkin_INCLUDE_DIRS}
-)
-
-#############
-## Install ##
-#############
-foreach(programs)
-  install(TARGETS ${programs}
-    RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+        ${catkin_INCLUDE_DIRS}
 )
-endforeach(nodes)
 
-install(DIRECTORY include
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-)
+foreach (programs)
+    install(TARGETS ${programs}
+            RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+            )
+endforeach (programs)
 
-foreach(dir launch rviz)
-  install(DIRECTORY ${dir}/
-    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+foreach (dir launch rviz)
+    install(DIRECTORY ${dir}/
+            DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
+endforeach (dir)
 
-install(PROGRAMS scripts/launch_sim.bash DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+install(PROGRAMS scripts/launch_sim.bash
+        DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+        )