Patch to fix building px4 binary

Attempt
Try target_include_directories
2026-06-01 17:49:32 +00:00 · 2022-07-26 06:27:13 +03:00 · 2022-07-24 02:11:34 +03:00 · 2022-07-23 20:48:31 +03:00 · 2022-07-23 20:46:06 +03:00 · 2022-07-23 20:07:11 +03:00
1 changed files with 10 additions and 6 deletions
--- a/scripts/install_software.sh
+++ b/scripts/install_software.sh
@@ -81,14 +81,18 @@ ln -s ~/catkin_ws/src/clover/clover_simulation/airframes/* ~/PX4-Autopilot/ROMFS
 echo "--- Installing geographiclib datasets"
 sudo -E sh -c '/opt/ros/noetic/lib/mavros/install_geographiclib_datasets.sh'

-echo "--- Build mavlink and fix issues"
-cd ~/catkin_ws
-catkin_make mavlink_c_generate
-ln -s "." build/mavlink/mavlink
-rm build/CMakeCache.txt
+echo "--- Build PX4"
+cd ~/PX4-Autopilot
+make px4_sitl

 echo "--- Building the workspace"
-catkin_make --force-cmake
+# sudo -E sh -c 'rm -rf /opt/ros/noetic/include/mavlink'
+ls ~/catkin_ws/src/PX4-Autopilot/build/px4_sitl_default/mavlink
+echo 'include_directories("/home/clover/PX4-Autopilot/build/px4_sitl_default/mavlink")' >> ~/catkin_ws/src/sitl_gazebo/CMakeLists.txt
+sed -i 's|#include <mavlink/mavlink_types.h>|#include <mavlink_types.h>|' ~/catkin_ws/src/PX4-Autopilot/src/modules/mavlink/mavlink_bridge_header.h
+cd ~/catkin_ws
+catkin_make mavlink_c_generate
+catkin_make

 echo "--- Installing Visual Studio Code"
 sudo -E sh -c 'apt-get update; apt-get install -y curl'
Author	SHA1	Message	Date
Oleg Kalachev	5d92f8e381	Patch to fix building px4 binary	2022-07-26 06:27:13 +03:00
Oleg Kalachev	ef46ca93bb	Attempt	2022-07-24 02:11:34 +03:00
Oleg Kalachev	7c8ced9790	Try target_include_directories	2022-07-23 20:48:31 +03:00
Oleg Kalachev	0e70776791	Fix	2022-07-23 20:46:06 +03:00
Oleg Kalachev	c540a1795b	Attempt	2022-07-23 20:07:11 +03:00
Oleg Kalachev	a0db84361a	Test	2022-07-23 19:25:29 +03:00
Oleg Kalachev	a6f6b29c68	Test	2022-07-23 17:34:21 +03:00
Oleg Kalachev	337a44a797	Another test	2022-07-23 16:39:26 +03:00
Oleg Kalachev	bb66b96268	And yet another	2022-07-23 14:53:16 +03:00
Oleg Kalachev	5c05441360	Another try to fix	2022-07-23 04:55:57 +03:00
Oleg Kalachev	3467bfcea7	Fix	2022-07-21 01:05:16 +03:00
Oleg Kalachev	781c9d6be4	Try to fix	2022-07-20 23:39:53 +03:00
Oleg Kalachev	2996d5fd59	Try to fix	2022-07-20 15:12:36 +03:00
Oleg Kalachev	19baebd635	Fix	2022-07-20 03:55:27 +03:00
Oleg Kalachev	9f02f76044	Try another approach to build the workspace	2022-07-19 23:49:03 +03:00