fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 07:28:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

uxrce_dds_client: CMakeLists.txt cleanup

Browse Source 
- common variable for Micro-XRCE-DDS-Client
 - don't mix tabs and spaces
 - px4 module include all dependencies
This commit is contained in:
Daniel Agar
2024-11-12 21:20:54 -05:00
parent b5d18c6131
commit a2156244d3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uxrce_dds_client/CMakeLists.txt
+8 -6
View File
@@ -32,10 +32,14 @@
############################################################################ ############################################################################
if(${CMAKE_VERSION} VERSION_LESS "3.11") if(${CMAKE_VERSION} VERSION_LESS "3.11")
message(WARNING "skipping uxrce_dds_client, Micro-XRCE-DDS-Client needs to be fixed to work with CMAKE_VERSION ${CMAKE_VERSION}") message(WARNING "skipping uxrce_dds_client, Micro-XRCE-DDS-Client needs to be fixed to work with CMAKE_VERSION ${CMAKE_VERSION}")
else() else()
px4_add_git_submodule(TARGET git_micro_xrce_dds_client PATH "${CMAKE_CURRENT_LIST_DIR}/Micro-XRCE-DDS-Client")
set(microxrceddsclient_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/Micro-XRCE-DDS-Client)
set(microxrceddsclient_build_dir ${CMAKE_CURRENT_BINARY_DIR})
px4_add_git_submodule(TARGET git_micro_xrce_dds_client PATH "${microxrceddsclient_src_dir}")
# If a toolchain file is given, explicitly define its path when building the Micro-XRCE-DDS-CLient # If a toolchain file is given, explicitly define its path when building the Micro-XRCE-DDS-CLient
if(CMAKE_TOOLCHAIN_FILE MATCHES "cmake$") if(CMAKE_TOOLCHAIN_FILE MATCHES "cmake$")
@@ -58,9 +62,6 @@ else()
set(lib_dir "lib") set(lib_dir "lib")
endif() endif()
set(microxrceddsclient_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/Micro-XRCE-DDS-Client)
set(microxrceddsclient_build_dir ${CMAKE_CURRENT_BINARY_DIR})
include(ExternalProject) include(ExternalProject)
ExternalProject_Add( ExternalProject_Add(
@@ -114,7 +115,6 @@ else()
target_include_directories(microxrceddsclient INTERFACE ${microxrceddsclient_build_dir}/include) target_include_directories(microxrceddsclient INTERFACE ${microxrceddsclient_build_dir}/include)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dds_topics.h add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dds_topics.h
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_dds_topics.py COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_dds_topics.py
--topic-msg-dir ${PX4_SOURCE_DIR}/msg --topic-msg-dir ${PX4_SOURCE_DIR}/msg
@@ -148,6 +148,8 @@ else()
srv_base.cpp srv_base.cpp
srv_base.h srv_base.h
DEPENDS DEPENDS
git_micro_xrce_dds_client
libmicroxrceddsclient_project
microxrceddsclient microxrceddsclient
libmicroxrceddsclient libmicroxrceddsclient
libmicrocdr libmicrocdr