Merge pull request #408 from agri-gaia/cleanup-examples

Cleanup C++ examples
DFKI-NI · Aug 13, 2024 · 2dbc8f3 · 2dbc8f3
2 parents 88e1e00 + 40ac233
commit 2dbc8f3
Show file tree

Hide file tree

Showing 17 changed files with 130 additions and 835 deletions.
diff --git a/examples/__init__.py b/examples/__init__.py
diff --git a/examples/cpp/ROS/CMakeLists.txt b/examples/cpp/ROS/CMakeLists.txt
diff --git a/examples/cpp/ROS/include/seerep_ros_examples/hdf5_node.h b/examples/cpp/ROS/include/seerep_ros_examples/hdf5_node.h
diff --git a/examples/cpp/ROS/launch/hdf5_node.launch b/examples/cpp/ROS/launch/hdf5_node.launch
diff --git a/examples/cpp/ROS/package.xml b/examples/cpp/ROS/package.xml
diff --git a/examples/cpp/ROS/src/hdf5_node.cpp b/examples/cpp/ROS/src/hdf5_node.cpp
diff --git a/examples/cpp/gRPC/CATKIN_IGNORE b/examples/cpp/gRPC/CATKIN_IGNORE
diff --git a/examples/cpp/gRPC/CMakeLists.txt b/examples/cpp/gRPC/CMakeLists.txt
@@ -1,51 +1,31 @@
 cmake_minimum_required(VERSION 3.0.2)
-project(examples_cpp VERSION 0.1)
+project(seerep_cpp_examples VERSION 0.1)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
 find_package(SeerepCom REQUIRED)
 find_package(SeerepMsgs REQUIRED)
 
 find_package(Flatbuffers REQUIRED)
-find_package(Protobuf REQUIRED)
 find_package(gRPC CONFIG REQUIRED)
 
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(
-  Boost
-  COMPONENTS program_options log log_setup
-  REQUIRED
-)
-
 include_directories(
   include
   ${SeerepCom_INCLUDE_DIRS}
   ${SeerepMsgs_INCLUDE_DIRS}
   ${FLATBUFFER_INCLUDE_DIR}
-  ${PROTOBUF_INCLUDE_DIR}
-  ${Boost_INCLUDE_DIRS}
 )
 
-add_executable(${PROJECT_NAME}_queryImages src/queryImages.cpp)
+add_executable(image_query src/image_query.cpp)
 
-set(common_link_libs
-    ${SeerepCom_LIBRARIES}
-    ${seerep_ros_conversions_pb_LIBRARIES}
-    ${catkin_LIBRARIES}
-    ${Boost_LIBRARIES}
-    ${Boost_LOG_LIBRARY}
-    ${Boost_LOG_SETUP_LIBRARY}
-    gRPC::grpc++_reflection
+set(link_libs ${SeerepCom_LIBRARIES} ${catkin_LIBRARIES}
+              gRPC::grpc++_reflection
 )
-target_link_libraries(${PROJECT_NAME}_queryImages ${common_link_libs})
+target_link_libraries(image_query ${link_libs})
 
 install(
-  TARGETS ${PROJECT_NAME}_queryImages
+  TARGETS image_query
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}