[fix] Install commands for all the packages (autowarefoundation#1861)

* Initial fixes to detection, sensing, semantics and utils * fixing wrong filename on install command * Fixes to install commands * Hokuyo fix name * Fix obj db * Obj db include fixes * End of final cleaning sweep * Incorrect command order in runtime manager * Param tempfile not required by runtime_manager * * Fixes to runtime manager install commands * Remove devel directory from catkin, if any * Updated launch files for robosense * Updated robosense * Fix/add missing install (autowarefoundation#1977) * Added launch install to lidar_kf_contour_track * Added install to op_global_planner * Added install to way_planner * Added install to op_local_planner * Added install to op_simulation_package * Added install to op_utilities * Added install to sync * * Improved installation script for pointgrey packages * Fixed nodelet error for gmsl cameras * USe install space in catkin as well * add install to catkin * Fix install directives (autowarefoundation#1990) * Fixed installation path * Fixed params installation path * Fixed cfg installation path * Delete cache on colcon_release
NuronLabs · Feb 18, 2019 · 6657492 · 6657492
1 parent a94c8d3
commit 6657492
Show file tree

Hide file tree

Showing 94 changed files with 977 additions and 569 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "ros/src/sensing/drivers/lidar/packages/robosense"]
 	path = ros/src/sensing/drivers/lidar/packages/robosense
 	url = https://github.com/CPFL/robosense
+	branch = develop-curves-function
 [submodule "ros/src/msgs/lgsvl_msgs"]
 	path = ros/src/msgs/lgsvl_msgs
 	url = https://github.com/lgsvl/lgsvl_msgs.git

diff --git a/ros/catkin_make_release b/ros/catkin_make_release
@@ -12,10 +12,15 @@ if [[ -d devel ]]; then
     rm -rf devel
 fi
 
-CATKIN_OPTS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs"
+if [[ -d install ]]; then
+    rm -rf install
+fi
+
+if [[ -d log ]]; then
+    rm -rf log
+fi
 
-catkin_make clean $CATKIN_OPTS
-source devel/setup.bash
+CATKIN_OPTS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr/local/cuda/lib64/stubs install"
 
 export LIBRARY_PATH=/usr/lib/OpenNI2/Drivers:$LIBRARY_PATH
 catkin_make $CATKIN_OPTS $@
diff --git a/ros/colcon_release b/ros/colcon_release
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -e
 
+if [[ -d devel ]]; then
+    rm -rf devel
+fi
+
 if [[ -d build ]]; then
     rm -rf build
 fi
@@ -9,6 +13,10 @@ if [[ -d install ]]; then
     rm -rf install
 fi
 
+if [[ -d log ]]; then
+    rm -rf log
+fi
+
 if [ -f src/CMakeLists.txt ]; then
 	rm -r src/CMakeLists.txt
 fi

diff --git a/ros/run b/ros/run
@@ -43,7 +43,7 @@ if [ "$?" == "0" ]; then
 fi
 
 # boot ros-master
-${TERMINAL} ${MASTER_DISPLAY_OPTION} ${OPTION_WORKING_DIR}=${MY_PATH} ${OPTION_COMMAND}="bash -c 'source ./devel/setup.bash; roscore'"&
+${TERMINAL} ${MASTER_DISPLAY_OPTION} ${OPTION_WORKING_DIR}=${MY_PATH} ${OPTION_COMMAND}="bash -c 'source ./install/setup.bash; roscore'"&
 
 # boot runtime_manager
-${TERMINAL} ${RUNMGR_DISPLAY_OPTION} ${OPTION_WORKING_DIR}=${MY_PATH} ${OPTION_COMMAND}="bash -c 'source ./devel/setup.bash; rosrun runtime_manager runtime_manager_dialog.py'"
+${TERMINAL} ${RUNMGR_DISPLAY_OPTION} ${OPTION_WORKING_DIR}=${MY_PATH} ${OPTION_COMMAND}="bash -c 'source ./install/setup.bash; rosrun runtime_manager runtime_manager_dialog.py'"
diff --git a/ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt b/ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt
@@ -53,3 +53,12 @@ target_link_libraries(g30esli_interface
   ${catkin_LIBRARIES}
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/libymc_can_${LIB_VERSION}${LIB_ARCH}.a
 )
+
+install(TARGETS g30esli_interface
+        ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
diff --git a/ros/src/common/libvectormap/FindEigen.cmake b/ros/src/common/libvectormap/FindEigen.cmake
diff --git a/...rc/computing/perception/detection/fusion_tools/packages/pixel_cloud_fusion/CMakeLists.txt b/...rc/computing/perception/detection/fusion_tools/packages/pixel_cloud_fusion/CMakeLists.txt
@@ -88,11 +88,14 @@ target_include_directories(pixel_cloud_fusion PRIVATE
 target_link_libraries(pixel_cloud_fusion
         pixel_cloud_fusion_lib)
 
-install(TARGETS pixel_cloud_fusion
+install(TARGETS pixel_cloud_fusion pixel_cloud_fusion_lib
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
+install(DIRECTORY include/${PROJECT_NAME}/
+        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+
 install(DIRECTORY launch/
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
         PATTERN ".svn" EXCLUDE)
diff --git a/...c/computing/perception/detection/fusion_tools/packages/range_vision_fusion/CMakeLists.txt b/...c/computing/perception/detection/fusion_tools/packages/range_vision_fusion/CMakeLists.txt
@@ -110,11 +110,14 @@ target_include_directories(range_vision_fusion PRIVATE
 target_link_libraries(range_vision_fusion
         range_vision_fusion_lib)
 
-install(TARGETS range_vision_fusion
+install(TARGETS range_vision_fusion range_vision_fusion_lib
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
+install(DIRECTORY include/${PROJECT_NAME}/
+        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+
 install(DIRECTORY launch/
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
         PATTERN ".svn" EXCLUDE)
diff --git a/...erception/detection/lidar_detector/packages/lidar_euclidean_cluster_detect/CMakeLists.txt b/...erception/detection/lidar_detector/packages/lidar_euclidean_cluster_detect/CMakeLists.txt
@@ -54,7 +54,6 @@ include_directories(
         ${autoware_msgs_INCLUDE_DIRS}
         ${OpenCV_INCLUDE_DIRS}
 )
-link_directories(${PCL_LIBRARY_DIRS})
 link_directories(${OpenCV_LIBRARY_DIRS})
 
 #Euclidean Cluster
@@ -82,15 +81,20 @@ if (${CUDA_FOUND})
     target_link_libraries(lidar_euclidean_cluster_detect
             ${OpenCV_LIBRARIES}
             ${catkin_LIBRARIES}
-            ${PCL_LIBRARIES}
             ${YAML_CPP_LIBRARIES}
             gpu_euclidean_clustering)
 
+    install(TARGETS
+            gpu_euclidean_clustering
+            ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+            LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+            RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+            )
+
 else ()
     target_link_libraries(lidar_euclidean_cluster_detect
             ${OpenCV_LIBRARIES}
             ${catkin_LIBRARIES}
-            ${PCL_LIBRARIES}
             ${YAML_CPP_LIBRARIES})
 
 endif ()
@@ -106,9 +110,16 @@ if (OPENMP_FOUND)
             )
 endif ()
 
+install(DIRECTORY include/
+        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+
 install(TARGETS
         lidar_euclidean_cluster_detect
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-        RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
diff --git a/...mputing/perception/detection/lidar_detector/packages/lidar_fake_perception/CMakeLists.txt b/...mputing/perception/detection/lidar_detector/packages/lidar_fake_perception/CMakeLists.txt
@@ -50,5 +50,9 @@ install(TARGETS
   lidar_fake_perception_node
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
diff --git a/...ng/perception/detection/lidar_detector/packages/lidar_naive_l_shape_detect/CMakeLists.txt b/...ng/perception/detection/lidar_detector/packages/lidar_naive_l_shape_detect/CMakeLists.txt
@@ -25,7 +25,6 @@ catkin_package(
   )
 
 
-link_directories(${PCL_LIBRARY_DIRS})
 link_directories(${OpenCV_LIBRARY_DIRS})
 
 include_directories(
@@ -35,19 +34,28 @@ include_directories(
   ${OpenCV_INCLUDE_DIRS}
 )
 
-set(SOURCE_FILES nodes/lidar_naive_l_shape_detect/lidar_naive_l_shape_detect_node.cpp nodes/lidar_naive_l_shape_detect/lidar_naive_l_shape_detect.cpp)
+set(SOURCE_FILES
+        nodes/lidar_naive_l_shape_detect/lidar_naive_l_shape_detect_node.cpp
+        nodes/lidar_naive_l_shape_detect/lidar_naive_l_shape_detect.cpp)
 
 add_executable(lidar_naive_l_shape_detect ${SOURCE_FILES})
 
 add_dependencies(lidar_naive_l_shape_detect
         ${catkin_EXPORTED_TARGETS}
         )
 
-target_link_libraries(lidar_naive_l_shape_detect ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
+target_link_libraries(lidar_naive_l_shape_detect
+        ${catkin_LIBRARIES}
+        ${OpenCV_LIBRARIES}
+        )
 
 install(TARGETS
         lidar_naive_l_shape_detect
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-        RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
diff --git a/...puting/perception/detection/lidar_tracker/packages/lidar_imm_ukf_pda_track/CMakeLists.txt b/...puting/perception/detection/lidar_tracker/packages/lidar_imm_ukf_pda_track/CMakeLists.txt
@@ -31,8 +31,6 @@ include_directories(
   ${catkin_INCLUDE_DIRS}
   include)
 
-link_directories(${PCL_LIBRARY_DIRS})
-
 #imm_ukf_pda
 add_executable(imm_ukf_pda
         nodes/imm_ukf_pda/imm_ukf_pda_main.cpp
@@ -41,7 +39,6 @@ add_executable(imm_ukf_pda
         )
 target_link_libraries(imm_ukf_pda
         ${catkin_LIBRARIES}
-        ${PCL_LIBRARIES}
         )
 add_dependencies(imm_ukf_pda
         ${catkin_EXPORTED_TARGETS}
@@ -52,5 +49,9 @@ install(TARGETS
         imm_ukf_pda
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-        RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         )
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
diff --git a/...mputing/perception/detection/lidar_tracker/packages/lidar_kf_contour_track/CMakeLists.txt b/...mputing/perception/detection/lidar_tracker/packages/lidar_kf_contour_track/CMakeLists.txt
@@ -52,5 +52,9 @@ install(TARGETS
         lidar_kf_contour_track
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-        RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
diff --git a/...mputing/perception/detection/object_filter/packages/lidar_shape_estimation/CMakeLists.txt b/...mputing/perception/detection/object_filter/packages/lidar_shape_estimation/CMakeLists.txt
@@ -61,7 +61,7 @@ install(TARGETS lidar_shape_estimation
         )
 
 install(DIRECTORY launch/
-        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
         FILES_MATCHING PATTERN "*.launch"
         )
 

diff --git a/...rc/computing/perception/detection/object_filter/packages/roi_object_filter/CMakeLists.txt b/...rc/computing/perception/detection/object_filter/packages/roi_object_filter/CMakeLists.txt
@@ -97,7 +97,7 @@ target_include_directories(roi_object_filter PRIVATE
 target_link_libraries(roi_object_filter
         roi_object_filter_lib)
 
-install(TARGETS roi_object_filter
+install(TARGETS roi_object_filter_lib roi_object_filter
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

diff --git a/ros/src/computing/perception/detection/trafficlight_recognizer/CMakeLists.txt b/ros/src/computing/perception/detection/trafficlight_recognizer/CMakeLists.txt
@@ -299,7 +299,7 @@ else ()                          # if(EXISTS "${SSD_CAFFE_PATH}")
 endif ()                         # if(EXISTS "${SSD_CAFFE_PATH}")
 
 
-install(TARGETS region_tlr feat_proj tlr_tuner roi_extractor label_maker
+install(TARGETS region_tlr feat_proj tlr_tuner roi_extractor label_maker libcontext tl_switch
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

diff --git a/ros/src/computing/perception/detection/vision_detector/libs/dpm_ttic/CMakeLists.txt b/ros/src/computing/perception/detection/vision_detector/libs/dpm_ttic/CMakeLists.txt
@@ -140,5 +140,5 @@ install(TARGETS
         libdpm_ttic
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-        RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         )
diff --git a/...uting/perception/detection/vision_detector/packages/vision_dpm_ttic_detect/CMakeLists.txt b/...uting/perception/detection/vision_detector/packages/vision_dpm_ttic_detect/CMakeLists.txt
@@ -98,3 +98,11 @@ install(TARGETS vision_dpm_ttic_detect
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         )
+
+install(DIRECTORY launch/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+        PATTERN ".svn" EXCLUDE)
+
+install(DIRECTORY data/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/data
+        PATTERN ".svn" EXCLUDE)