Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Adapt to new Micro XRCE-DDS Client configuration approach #24

Merged
pablogs9 merged 1 commit into from
Jun 2, 2020
Merged

Adapt to new Micro XRCE-DDS Client configuration approach #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions microxrcedds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,37 +102,34 @@ $(MICRO_XRCE_INSTALL_DIR)/lib/libmicroxrcedds_client.a: $(MICRO_XRCE_DIR)/build/
make install

$(MICRO_XRCE_DIR)/build/CMakeCache.txt: $(TOPDIR)/.config
$(Q) echo 'PROFILE_CREATE_ENTITIES_REF=$(PROFILE_CREATE_ENTITIES_REF)' > $(MICRO_XRCE_DIR)/client.config; \
echo 'PROFILE_CREATE_ENTITIES_XML=$(PROFILE_CREATE_ENTITIES_XML)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'PROFILE_WRITE_ACCESS=TRUE' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'PROFILE_READ_ACCESS=$(PROFILE_READ_ACCESS)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'PROFILE_SERIAL_TRANSPORT=$(PROFILE_SERIAL_TRANSPORT)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'PROFILE_UDP_TRANSPORT=$(PROFILE_UDP_TRANSPORT)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'PROFILE_TCP_TRANSPORT=$(PROFILE_TCP_TRANSPORT)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_SERIAL_TRANSPORT_MTU=$(CONFIG_MR_SERIAL_TRANSPORT_MTU)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_UDP_TRANSPORT_MTU=$(CONFIG_MR_UDP_TRANSPORT_MTU)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_TCP_TRANSPORT_MTU=$(CONFIG_MR_TCP_TRANSPORT_MTU)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MAX_OUTPUT_BEST_EFFORT_STREAMS=$(CONFIG_MR_MAX_OUTPUT_BEST_EFFORT_STREAMS)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MAX_OUTPUT_RELIABLE_STREAMS=$(CONFIG_MR_MAX_OUTPUT_RELIABLE_STREAMS)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MAX_INPUT_BEST_EFFORT_STREAMS=$(CONFIG_MR_MAX_INPUT_BEST_EFFORT_STREAMS)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MAX_INPUT_RELIABLE_STREAMS=$(CONFIG_MR_MAX_INPUT_RELIABLE_STREAMS)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MAX_SESSION_CONNECTION_ATTEMPTS=$(CONFIG_MR_MAX_SESSION_CONNECTION_ATTEMPTS)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MIN_SESSION_CONNECTION_INTERVAL=$(CONFIG_MR_MIN_SESSION_CONNECTION_INTERVAL)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_MIN_HEARTBEAT_TIME_INTERVAL=$(CONFIG_MR_MIN_HEARTBEAT_TIME_INTERVAL)' >> $(MICRO_XRCE_DIR)/client.config; \
echo 'CONFIG_SERIALIZATION_ENDIANNESS=$(CONFIG_SERIALIZATION_ENDIANNESS)' >> $(MICRO_XRCE_DIR)/client.config
$(Q) mkdir -p $(MICRO_XRCE_DIR)/build
$(Q) cd $(MICRO_XRCE_DIR)/build; \
cmake -DCMAKE_TOOLCHAIN_FILE=$(MICRO_XRCE_DIR)/../toolchain.cmake \
cmake \
-DARCH_CPU_FLAGS="$(ARCHCPUFLAGS)" \
-DARCH_OPT_FLAGS="$(ARCHOPTIMIZATION)" \
-DCHECK_ENDIANNESS=OFF \
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
-DCMAKE_INSTALL_PREFIX=$(MICRO_XRCE_INSTALL_DIR) \
-DCMAKE_SYSROOT=$(TOPDIR) \
-DCMAKE_TOOLCHAIN_FILE=$(MICRO_XRCE_DIR)/../toolchain.cmake \
-DCROSSDEV=$(CROSSDEV) \
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
-DUCLIENT_BIG_ENDIANNESS=$(CONFIG_SERIALIZATION_ENDIANNESS) \
-DUCLIENT_PROFILE_UDP=$(PROFILE_UDP_TRANSPORT) \
-DUCLIENT_PROFILE_TCP=$(PROFILE_TCP_TRANSPORT) \
-DUCLIENT_PROFILE_SERIAL=$(PROFILE_SERIAL_TRANSPORT) \
-DUCLIENT_MAX_OUTPUT_BEST_EFFORT_STREAMS=$(CONFIG_MAX_OUTPUT_BEST_EFFORT_STREAMS) \
-DUCLIENT_MAX_OUTPUT_RELIABLE_STREAMS=$(CONFIG_MAX_OUTPUT_RELIABLE_STREAMS) \
-DUCLIENT_MAX_INPUT_BEST_EFFORT_STREAMS=$(CONFIG_MAX_INPUT_BEST_EFFORT_STREAMS) \
-DUCLIENT_MAX_INPUT_RELIABLE_STREAMS=$(CONFIG_MAX_INPUT_RELIABLE_STREAMS) \
-DUCLIENT_MAX_SESSION_CONNECTION_ATTEMPTS=$(CONFIG_MAX_SESSION_CONNECTION_ATTEMPTS) \
-DUCLIENT_MIN_SESSION_CONNECTION_INTERVAL=$(CONFIG_MIN_SESSION_CONNECTION_INTERVAL) \
-DUCLIENT_MIN_HEARTBEAT_TIME_INTERVAL=$(CONFIG_MIN_HEARTBEAT_TIME_INTERVAL) \
-DUCLIENT_UDP_TRANSPORT_MTU=$(CONFIG_MR_UDP_TRANSPORT_MTU) \
-DUCLIENT_TCP_TRANSPORT_MTU=$(CONFIG_MR_TCP_TRANSPORT_MTU) \
-DUCLIENT_SERIAL_TRANSPORT_MTU=$(CONFIG_MR_SERIAL_TRANSPORT_MTU) \
-DVERBOSE_SERIALIZATION=$(VERBOSE_OPT) \
-DVERBOSE_MESSAGE=$(VERBOSE_OPT) \
-DCHECK_ENDIANNESS=OFF \
-DTHIRDPARTY=ON \
-DARCH_CPU_FLAGS="$(ARCHCPUFLAGS)" \
-DARCH_OPT_FLAGS="$(ARCHOPTIMIZATION)" \
-DCMAKE_INSTALL_PREFIX=$(MICRO_XRCE_INSTALL_DIR) ..; \
..; \

install:
$(Q) cd $(MICRO_XRCE_DIR)/build/; \
Expand Down