Skip to content

Commit 97aba34

Browse files
author
donRaphaco
authored
optional app-colcon.meta in project directory (#57)
Signed-off-by: Raphael Vogelgsang <fixed-term.Raphael.Vogelgsang@de.bosch.com>
1 parent d7754e1 commit 97aba34

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ else()
88
set(submake "make")
99
endif()
1010

11+
set(APP_COLCON_META "${PROJECT_DIR}/app-colcon.meta")
12+
if(NOT EXISTS "${APP_COLCON_META}")
13+
set(APP_COLCON_META "")
14+
endif()
15+
1116
externalproject_add(libmicroros_project
1217
PREFIX ${CMAKE_BINARY_DIR}/libmicroros-prefix
1318
SOURCE_DIR ${COMPONENT_DIR}
@@ -24,6 +29,7 @@ externalproject_add(libmicroros_project
2429
BUILD_DIR=${CMAKE_BINARY_DIR}
2530
IDF_PATH=${IDF_PATH}
2631
IDF_TARGET=${IDF_TARGET}
32+
APP_COLCON_META=${APP_COLCON_META}
2733
INSTALL_COMMAND ""
2834
BUILD_BYPRODUCTS ${COMPONENT_DIR}/libmicroros.a
2935
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"names": {
3+
"rmw_microxrcedds": {
4+
"cmake-args": [
5+
"-DRMW_UXRCE_TRANSPORT=custom"
6+
]
7+
}
8+
}
9+
}

libmicroros.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/install: $(EXTENSIONS_DIR)/esp32_toolchain.cmake
7979
colcon build \
8080
--merge-install \
8181
--packages-ignore-regex=.*_cpp \
82-
--metas $(EXTENSIONS_DIR)/colcon.meta \
82+
--metas $(EXTENSIONS_DIR)/colcon.meta $(APP_COLCON_META) \
8383
--cmake-args \
8484
"--no-warn-unused-cli" \
8585
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF \

0 commit comments

Comments
 (0)