summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevron Rees <tripzero.kev@gmail.com>2016-09-22 19:28:12 -0700
committerGitHub <noreply@github.com>2016-09-22 19:28:12 -0700
commitef767aed1fc86c5b601fb3ad0d1e29a4090831f3 (patch)
treea7f8f452f7436f64bc6fba4f08fbe6deba4ebc87
parentb1dbbc7d0a3925367d950a6433c809a6a8e7fe07 (diff)
parentb2acc85acf91cb32134dc5ff5e4330265894ccee (diff)
downloadautomotive-message-broker-ef767aed1fc86c5b601fb3ad0d1e29a4090831f3.tar.gz
Merge pull request #77 from again4you/fix_json2amb
Fix compile time error when building generated code by json2amb
-rw-r--r--tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt
index f5bfee92..59d5344a 100644
--- a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt
+++ b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt
@@ -5,6 +5,7 @@ set(PLUGIN_SEGMENT_INSTALL_PATH "/etc/ambd/plugins.d")
set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}" )
set(PLUGIN_INSTALL_PATH "${LIB_INSTALL_DIR}/automotive-message-broker")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
# to install plugin into /usr instead of /usr/local
set (CMAKE_INSTALL_PREFIX /usr)
@@ -28,9 +29,6 @@ find_package(Boost REQUIRED)
pkg_check_modules(glib REQUIRED glib-2.0)
pkg_check_modules(json REQUIRED json)
-
-add_definitions(-std=gnu++0x)
-
pkg_check_modules( amb REQUIRED automotive-message-broker )
pkg_check_modules( amb-plugins-common REQUIRED amb-plugins-common )