Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

simulation: restore 'gazebo' alias for 'gazebo_iris'

Browse Source 
- only create helper targets if Gazebo 11 found on system
This commit is contained in:
Daniel Agar
2023-01-14 17:03:18 -05:00
committed by GitHub
parent 82ecbccd85
commit 52b9b9ba2f
2 changed files with 209 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/px4/sitl/default.px4board
+1 -1
View File
@@ -44,7 +44,7 @@ CONFIG_MODULES_REPLAY=y
CONFIG_MODULES_ROVER_POS_CONTROL=y CONFIG_MODULES_ROVER_POS_CONTROL=y
CONFIG_MODULES_SENSORS=y CONFIG_MODULES_SENSORS=y
CONFIG_COMMON_SIMULATION=y CONFIG_COMMON_SIMULATION=y
CONFIG_MODULES_SIMULATION_GZ_BRIDGE=y CONFIG_MODULES_SIMULATION_GZ_BRIDGE=n
CONFIG_MODULES_TEMPERATURE_COMPENSATION=y CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
CONFIG_MODULES_UUV_ATT_CONTROL=y CONFIG_MODULES_UUV_ATT_CONTROL=y
CONFIG_MODULES_UUV_POS_CONTROL=y CONFIG_MODULES_UUV_POS_CONTROL=y
src/modules/simulation/simulator_mavlink/sitl_targets_gazebo.cmake
+10
View File
@@ -1,3 +1,10 @@
find_package(gazebo)
if(gazebo_FOUND)
message(STATUS "Found gazebo-classic ${gazebo_VERSION}, including sitl_gazebo-classic simulator and targets")
# Estimate an appropriate number of parallel jobs # Estimate an appropriate number of parallel jobs
cmake_host_system_information(RESULT AVAILABLE_PHYSICAL_MEMORY QUERY AVAILABLE_PHYSICAL_MEMORY) cmake_host_system_information(RESULT AVAILABLE_PHYSICAL_MEMORY QUERY AVAILABLE_PHYSICAL_MEMORY)
cmake_host_system_information(RESULT NUMBER_OF_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES) cmake_host_system_information(RESULT NUMBER_OF_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES)
@@ -210,6 +217,8 @@ foreach(debugger ${debuggers})
endforeach() endforeach()
endforeach() endforeach()
add_custom_target(gazebo DEPENDS gazebo_iris) # alias
# mavsdk tests currently depend on sitl_gazebo # mavsdk tests currently depend on sitl_gazebo
ExternalProject_Add(mavsdk_tests ExternalProject_Add(mavsdk_tests
SOURCE_DIR ${PX4_SOURCE_DIR}/test/mavsdk_tests SOURCE_DIR ${PX4_SOURCE_DIR}/test/mavsdk_tests
@@ -221,3 +230,4 @@ ExternalProject_Add(mavsdk_tests
EXCLUDE_FROM_ALL true EXCLUDE_FROM_ALL true
BUILD_ALWAYS 1 BUILD_ALWAYS 1
) )
endif()