Simplify use of scope_guard

moveit · Jul 17, 2024 · 167a57b · 167a57b
1 parent 6761c68
commit 167a57b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,6 +3,6 @@
 	url = https://github.com/pybind/pybind11
 	branch = smart_holder
 	shallow = true
-[submodule "scope_guard"]
-	path = core/scope_guard/scope_guard
+[submodule "core/src/scope_guard"]
+	path = core/src/scope_guard
 	url = https://github.com/ricab/scope_guard
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -42,7 +42,6 @@ add_compile_options(-fvisibility-inlines-hidden)
 
 set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/moveit/task_constructor)
 
-add_subdirectory(scope_guard)
 add_subdirectory(src)
 add_subdirectory(python)
 add_subdirectory(test)

diff --git a/core/scope_guard/CMakeLists.txt b/core/scope_guard/CMakeLists.txt
diff --git a/core/scope_guard/include/scope_guard/scope_guard.hpp b/core/scope_guard/include/scope_guard/scope_guard.hpp
diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library(${PROJECT_NAME}
 	solvers/pipeline_planner.cpp
 	solvers/multi_planner.cpp
 )
-target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} fmt::fmt scope_guard::scope_guard)
+target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} fmt::fmt)
 target_include_directories(${PROJECT_NAME}
 	PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
 	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

diff --git a/core/scope_guard/scope_guard → core/src/scope_guard b/core/scope_guard/scope_guard → core/src/scope_guard