aboutsummaryrefslogtreecommitdiffstats
path: root/CAN-binder/etc
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-04 14:28:09 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-04 14:28:09 +0200
commit9e86564a58a0f9c83edc5bb76fd8ab4c7e7a63ee (patch)
tree60a7f76c8a5866b6ef30fb2b032351354d0a14a7 /CAN-binder/etc
parent7679cd97dc4c20103f8afb364437dbcfd359befc (diff)
Update with last app-templates modifications
https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-templates Change-Id: I42eff75b790b70047e1b91b963edf458084881c9 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/etc')
-rw-r--r--CAN-binder/etc/export.map2
-rw-r--r--CAN-binder/etc/macros.cmake7
2 files changed, 4 insertions, 5 deletions
diff --git a/CAN-binder/etc/export.map b/CAN-binder/etc/export.map
index 52c1b4aa..ee2f4133 100644
--- a/CAN-binder/etc/export.map
+++ b/CAN-binder/etc/export.map
@@ -1 +1 @@
-{ global: afbBindingV1*; local: *; };
+{ global: afbBindingV*; local: *; };
diff --git a/CAN-binder/etc/macros.cmake b/CAN-binder/etc/macros.cmake
index afad28a6..5e00b9d0 100644
--- a/CAN-binder/etc/macros.cmake
+++ b/CAN-binder/etc/macros.cmake
@@ -75,29 +75,28 @@ macro(populate_widget)
set(POPULE_WIDGET_TARGET "populate_${TARGET_NAME}")
get_target_property(T ${TARGET_NAME} LABELS)
+ get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME)
if(${T} STREQUAL "BINDING")
add_custom_command(OUTPUT ${WIDGET_LIBDIR}/${TARGET_NAME}.so
DEPENDS ${TARGET_NAME}
COMMAND mkdir -p ${WIDGET_LIBDIR}
- COMMAND cp ${TARGET_NAME}.so ${WIDGET_LIBDIR}
+ COMMAND cp ${OUT}.so ${WIDGET_LIBDIR}
)
add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_LIBDIR}/${TARGET_NAME}.so)
elseif(${T} STREQUAL "EXECUTABLE")
add_custom_command(OUTPUT ${WIDGET_BINDIR}/${TARGET_NAME}
DEPENDS ${TARGET_NAME}
COMMAND mkdir -p ${WIDGET_BINDIR}
- COMMAND cp ${TARGET_NAME} ${WIDGET_BINDIR}
+ COMMAND cp ${OUT} ${WIDGET_BINDIR}
)
add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_BINDIR}/${TARGET_NAME})
elseif(${T} STREQUAL "HTDOCS")
- get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME)
add_custom_command(OUTPUT ${WIDGET_HTTPDIR}
DEPENDS ${TARGET_NAME}
COMMAND cp -r ${OUT} ${WIDGET_HTTPDIR}
)
add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_HTTPDIR})
elseif(${T} STREQUAL "DATA")
- get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME)
add_custom_command(OUTPUT ${WIDGET_DATADIR}
DEPENDS ${TARGET_NAME}
COMMAND cp -r ${OUT} ${WIDGET_DATADIR}