Removed comment on necessary line

samlaf · Mar 19, 2021 · 9a02bf5 · 9a02bf5
1 parent d7a4e0d
commit 9a02bf5
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/ROS/tello_catkin_ws/src/orb_slam_2_ros/CMakeLists.txt b/ROS/tello_catkin_ws/src/orb_slam_2_ros/CMakeLists.txt
@@ -23,25 +23,25 @@ ENDIF()
 
 LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/orb_slam2/cmake_modules)
 
-#find_package (catkin REQUIRED COMPONENTS
-#roscpp
-#rospy
-#std_msgs
-#cv_bridge
-#image_transport
-#tf
-#sensor_msgs
-#dynamic_reconfigure
-#message_generation
-#)
-
-#find_package(OpenCV 3.0 QUIET)
-#if(NOT OpenCV_FOUND)
-#   find_package(OpenCV 2.4.3 QUIET)
-#   if(NOT OpenCV_FOUND)
-#      message(FATAL_ERROR "OpenCV > 2.4.3 not found.")
-#   endif()
-#endif()
+find_package (catkin REQUIRED COMPONENTS
+roscpp
+rospy
+std_msgs
+cv_bridge
+image_transport
+tf
+sensor_msgs
+dynamic_reconfigure
+message_generation
+)
+
+find_package(OpenCV 3.0 QUIET)
+if(NOT OpenCV_FOUND)
+   find_package(OpenCV 2.4.3 QUIET)
+   if(NOT OpenCV_FOUND)
+      message(FATAL_ERROR "OpenCV > 2.4.3 not found.")
+   endif()
+endif()
 
 
 
@@ -55,9 +55,9 @@ execute_process(COMMAND chmod a+x ${DYNAMIC_RECONFIGURE_PATH}
         OUTPUT_VARIABLE cmd_ver)
 message(STATUS "Chmod a+x the dynamic_reconfigure file")
 
-#generate_dynamic_reconfigure_options(
-#        ${DYNAMIC_RECONFIGURE_PATH}
-#)
+generate_dynamic_reconfigure_options(
+        ${DYNAMIC_RECONFIGURE_PATH}
+)
 
 set(LIBS_ORBSLAM
 ${OpenCV_LIBS}
@@ -72,20 +72,20 @@ ${OpenCV_LIBS}
 ${catkin_LIBRARIES}
 )
 
-#add_service_files(
-#        FILES
-#        SaveMap.srv
-#)
+add_service_files(
+        FILES
+        SaveMap.srv
+)
 
-#generate_messages(
-#        DEPENDENCIES
-#        std_msgs
-#)
+generate_messages(
+        DEPENDENCIES
+        std_msgs
+)
 
-#catkin_package (
-#  CATKIN_DEPENDS roscpp rospy std_msgs cv_bridge image_transport tf sensor_msgs dynamic_reconfigure message_runtime
-#  LIBRARIES {PROJECT_NAME} libDBoW2 libg2o
-#)
+catkin_package (
+  CATKIN_DEPENDS roscpp rospy std_msgs cv_bridge image_transport tf sensor_msgs dynamic_reconfigure message_runtime
+  LIBRARIES {PROJECT_NAME} libDBoW2 libg2o
+)
 
 include_directories(
 ${PROJECT_SOURCE_DIR}/orb_slam2
@@ -141,7 +141,7 @@ add_executable (${PROJECT_NAME}_mono
 ros/src/MonoNode.cc
 ros/src/Node.cc
 )
-#add_dependencies (${PROJECT_NAME}_mono ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
+add_dependencies (${PROJECT_NAME}_mono ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
 
 target_link_libraries(${PROJECT_NAME}_mono
 ${LIBS_ROS}
@@ -152,7 +152,7 @@ add_executable (${PROJECT_NAME}_stereo
 ros/src/StereoNode.cc
 ros/src/Node.cc
 )
-#add_dependencies (${PROJECT_NAME}_stereo ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
+add_dependencies (${PROJECT_NAME}_stereo ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
 
 target_link_libraries(${PROJECT_NAME}_stereo
 ${LIBS_ROS}
@@ -163,13 +163,16 @@ add_executable (${PROJECT_NAME}_rgbd
 ros/src/RGBDNode.cc
 ros/src/Node.cc
 )
-#add_dependencies (${PROJECT_NAME}_rgbd ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
+add_dependencies (${PROJECT_NAME}_rgbd ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
 
 target_link_libraries(${PROJECT_NAME}_rgbd
 ${LIBS_ROS}
 ${Pangolin_LIBRARIES}
 )
 
+message(STATUS "printing CATKIN_PACKAGE_LIB_DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}" )
+message(STATUS "printing CATKIN_PACKAGE_BIN_DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}" )
+
 install(TARGETS ${PROJECT_NAME}_mono ${PROJECT_NAME}_stereo ${PROJECT_NAME}_rgbd
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
@@ -196,4 +199,4 @@ install(DIRECTORY orb_slam2/config/
 
 install(DIRECTORY orb_slam2/Vocabulary/
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/orb_slam2/Vocabulary
-)
+)
diff --git a/ROS/tello_catkin_ws/src/orb_slam_2_ros/CMakeLists_melodic.txt b/ROS/tello_catkin_ws/src/orb_slam_2_ros/CMakeLists_melodic.txt
@@ -152,7 +152,7 @@ add_executable (${PROJECT_NAME}_stereo
 ros/src/StereoNode.cc
 ros/src/Node.cc
 )
-#add_dependencies (${PROJECT_NAME}_stereo ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
+add_dependencies (${PROJECT_NAME}_stereo ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
 
 target_link_libraries(${PROJECT_NAME}_stereo
 ${LIBS_ROS}
@@ -163,7 +163,7 @@ add_executable (${PROJECT_NAME}_rgbd
 ros/src/RGBDNode.cc
 ros/src/Node.cc
 )
-#add_dependencies (${PROJECT_NAME}_rgbd ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
+add_dependencies (${PROJECT_NAME}_rgbd ${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
 
 target_link_libraries(${PROJECT_NAME}_rgbd
 ${LIBS_ROS}