summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-09 11:25:28 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-06-09 12:26:10 +0200
commit678a2b8f52dc426132473f7111dd1113898f094a (patch)
tree2e02b027df37e777ea6760fb125b941971aa44d4
parentad1a743a6eba4fcc94ac5fee591c46b92ce1b0ac (diff)
Update submodule about cmake templates and config
Change-Id: Ia4cdc62993fd585a89e214d21fdf465d0af3d59b Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--.gitmodules1
-rw-r--r--CAN-binder/conf.d/config.cmake4
m---------CAN-binder/conf.d/default0
3 files changed, 2 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index e65999e3..2a4297cf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
[submodule "CAN-binder/conf.d/default"]
path = CAN-binder/conf.d/default
url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates
- branch = reference
diff --git a/CAN-binder/conf.d/config.cmake b/CAN-binder/conf.d/config.cmake
index d27b386e..7916fa78 100644
--- a/CAN-binder/conf.d/config.cmake
+++ b/CAN-binder/conf.d/config.cmake
@@ -92,9 +92,9 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
# -------------------------
#set(EXTRA_LINK_LIBRARIES)
-# Optional force binding installation
+# Optional force installation prefix
# ------------------------------------
-set(BINDINGS_INSTALL_PREFIX /opt )
+set(INSTALL_PREFIX /opt )
# set(WIDGET_PREFIX DestinationPath)
# Optional force binding Linking flag
diff --git a/CAN-binder/conf.d/default b/CAN-binder/conf.d/default
-Subproject d63a072def64647022cff067aff65e957281bf4
+Subproject cc640c4cfed7d4a35cbbdbb23e09b9e76c88902