CMakeListsの修正 (#1)

developer-mkh · HABU Miki · web-flow · commit abe8a8f760a3 · 2025-06-10T10:28:23.000+09:00
* コンパイルを通すためのCMakeListsの修正。 RobotWebTools#72 (comment) に記載されていたもので、 RobotWebTools#72 のPRに含まれていなかったもの * .gitignore更新 （buildなどのROS 2ビルド後に作成されるフォルダを追加） --------- Co-authored-by: HABU Miki <m.habu@piezo-sonic.com>
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 CMakeLists.txt
 .vscode/
+build/
+install/
+log/
diff --git a/webrtc/CMakeLists.txt b/webrtc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 project(webrtc)
 
 if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build/depot_tools" OR
diff --git a/webrtc_ros/CMakeLists.txt b/webrtc_ros/CMakeLists.txt
@@ -12,6 +12,7 @@ find_package(webrtc REQUIRED)
 find_package(X11 REQUIRED)
 find_package(jsoncpp REQUIRED)
 find_package(OpenCV REQUIRED)
+find_package(ament_index_cpp REQUIRED)
 
 
 ###########
@@ -58,6 +59,7 @@ ament_target_dependencies(
     rclcpp
     std_msgs
     webrtc_ros_msgs    
+    ament_index_cpp
 
 )
 
@@ -109,4 +111,4 @@ install(DIRECTORY scripts
 )
 
 
-ament_package()
+ament_package()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
	`1`	`+cmake_minimum_required(VERSION 3.5)`
`2`	`2`	`project(webrtc)`
`3`	`3`
`4`	`4`	`if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build/depot_tools" OR`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ find_package(webrtc REQUIRED)`
`12`	`12`	`find_package(X11 REQUIRED)`
`13`	`13`	`find_package(jsoncpp REQUIRED)`
`14`	`14`	`find_package(OpenCV REQUIRED)`
	`15`	`+find_package(ament_index_cpp REQUIRED)`
`15`	`16`
`16`	`17`
`17`	`18`	`###########`
`@@ -58,6 +59,7 @@ ament_target_dependencies(`
`58`	`59`	`rclcpp`
`59`	`60`	`std_msgs`
`60`	`61`	`webrtc_ros_msgs`
	`62`	`+ ament_index_cpp`
`61`	`63`
`62`	`64`	`)`
`63`	`65`
`@@ -109,4 +111,4 @@ install(DIRECTORY scripts`
`109`	`111`	`)`
`110`	`112`
`111`	`113`
`112`		`-ament_package()`
	`114`	`+ament_package()`