use ortools 9.6

Fxx0105 · Aug 2, 2023 · 26bdc22 · 26bdc22
1 parent 67c62fc
commit 26bdc22
Show file tree

Hide file tree

Showing 3,486 changed files with 582,571 additions and 200,878 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1 +1 @@
-/opt/ros/melodic/share/catkin/cmake/toplevel.cmake
+/opt/ros/noetic/share/catkin/cmake/toplevel.cmake
diff --git a/src/tare_planner/CMakeLists.txt b/src/tare_planner/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 project(tare_planner)
 
 # add_compile_options(-std=c++11)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -68,7 +68,7 @@ target_link_libraries(pointcloud_utils ${catkin_LIBRARIES} ${PCL_LIBRARIES})
 
 add_library(tsp_solver src/tsp_solver/tsp_solver.cpp)
 add_dependencies(tsp_solver ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-target_link_libraries(tsp_solver ${catkin_LIBRARIES} ${CMAKE_CURRENT_SOURCE_DIR}/or-tools/lib/libortools.so ${CMAKE_CURRENT_SOURCE_DIR}/or-tools/lib/libglog.so)
+target_link_libraries(tsp_solver ${catkin_LIBRARIES} ${CMAKE_CURRENT_SOURCE_DIR}/or-tools/lib/libortools.so)
 
 add_library(viewpoint src/viewpoint/viewpoint.cpp)
 add_dependencies(viewpoint ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
@@ -125,6 +125,7 @@ add_executable(tare_planner_node src/tare_planner_node/tare_planner_node.cpp)
 add_dependencies(tare_planner_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} )
 target_link_libraries(tare_planner_node ${catkin_LIBRARIES} sensor_coverage_planner_ground)
 
+
 #############
 ## Install ##
 #############

diff --git a/src/tare_planner/include/absl/BUILD.bazel b/src/tare_planner/include/absl/BUILD.bazel
diff --git a/src/tare_planner/include/absl/CMakeLists.txt b/src/tare_planner/include/absl/CMakeLists.txt
diff --git a/src/tare_planner/include/absl/algorithm/BUILD.bazel b/src/tare_planner/include/absl/algorithm/BUILD.bazel
diff --git a/src/tare_planner/include/absl/algorithm/CMakeLists.txt b/src/tare_planner/include/absl/algorithm/CMakeLists.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/opt/ros/melodic/share/catkin/cmake/toplevel.cmake
		/opt/ros/noetic/share/catkin/cmake/toplevel.cmake