From 368767709527a454b1a5f38e380107a7a3077a47 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 1 Oct 2019 13:49:57 -0400 Subject: [PATCH] cmake: show sitl_gazebo build output and improve rebuild --- boards/px4/sitl/default.cmake | 4 ++-- boards/px4/sitl/rtps.cmake | 2 +- boards/px4/sitl/test.cmake | 4 ++-- platforms/posix/cmake/sitl_target.cmake | 13 +++++-------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake index 933de2eb01..8ad9c8c8cc 100644 --- a/boards/px4/sitl/default.cmake +++ b/boards/px4/sitl/default.cmake @@ -91,10 +91,10 @@ set_property(CACHE config_sitl_debugger PROPERTY STRINGS "disable;gdb;lldb") # support. In this case, we enable the orb publisher rules. set(REPLAY_FILE "$ENV{replay}") if(REPLAY_FILE) - message("Building with uorb publisher rules support") + message(STATUS "Building with uorb publisher rules support") add_definitions(-DORB_USE_PUBLISHER_RULES) - message("Building without lockstep for replay") + message(STATUS "Building without lockstep for replay") set(ENABLE_LOCKSTEP_SCHEDULER no) else() set(ENABLE_LOCKSTEP_SCHEDULER yes) diff --git a/boards/px4/sitl/rtps.cmake b/boards/px4/sitl/rtps.cmake index 28e278a335..fe88dc2b9b 100644 --- a/boards/px4/sitl/rtps.cmake +++ b/boards/px4/sitl/rtps.cmake @@ -95,7 +95,7 @@ if(REPLAY_FILE) message("Building with uorb publisher rules support") add_definitions(-DORB_USE_PUBLISHER_RULES) - message("Building without lockstep for replay") + message(STATUS "Building without lockstep for replay") set(ENABLE_LOCKSTEP_SCHEDULER no) else() set(ENABLE_LOCKSTEP_SCHEDULER yes) diff --git a/boards/px4/sitl/test.cmake b/boards/px4/sitl/test.cmake index 4c8e62c669..1c18e6dbc3 100644 --- a/boards/px4/sitl/test.cmake +++ b/boards/px4/sitl/test.cmake @@ -91,9 +91,9 @@ set_property(CACHE config_sitl_debugger PROPERTY STRINGS "disable;gdb;lldb") # support. In this case, we enable the orb publisher rules. set(REPLAY_FILE "$ENV{replay}") if(REPLAY_FILE) - message("Building with uorb publisher rules support") + message(STATUS "Building with uorb publisher rules support") add_definitions(-DORB_USE_PUBLISHER_RULES) endif() -message("Building without lockstep for test") +message(STATUS "Building without lockstep for test") set(ENABLE_LOCKSTEP_SCHEDULER no) diff --git a/platforms/posix/cmake/sitl_target.cmake b/platforms/posix/cmake/sitl_target.cmake index a9e71a8364..69d47779cb 100644 --- a/platforms/posix/cmake/sitl_target.cmake +++ b/platforms/posix/cmake/sitl_target.cmake @@ -39,14 +39,11 @@ ExternalProject_Add(sitl_gazebo INSTALL_COMMAND "" DEPENDS git_gazebo - ) -set_target_properties(sitl_gazebo PROPERTIES EXCLUDE_FROM_ALL TRUE) - -ExternalProject_Add_Step(sitl_gazebo forceconfigure - DEPENDEES update - DEPENDERS configure - ALWAYS 1 - ) + USES_TERMINAL_CONFIGURE true + USES_TERMINAL_BUILD true + EXCLUDE_FROM_ALL true + BUILD_ALWAYS 1 +) # create targets for each viewer/model/debugger combination set(viewers none jmavsim gazebo)