From 678a2b8f52dc426132473f7111dd1113898f094a Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 9 Jun 2017 11:25:28 +0200 Subject: Update submodule about cmake templates and config Change-Id: Ia4cdc62993fd585a89e214d21fdf465d0af3d59b Signed-off-by: Romain Forlot --- .gitmodules | 1 - CAN-binder/conf.d/config.cmake | 4 ++-- CAN-binder/conf.d/default | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index e65999e..2a4297c 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 d27b386..7916fa7 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 index d63a072..cc640c4 160000 --- a/CAN-binder/conf.d/default +++ b/CAN-binder/conf.d/default @@ -1 +1 @@ -Subproject commit d63a072def64647022cff067aff65e957281bf43 +Subproject commit cc640c4cfed7d4a35cbbdbb23e09b9e76c88902b -- cgit 1.2.3-korg