bugfix about AirDistribution

[profile/ivi/automotive-message-broker.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c61454..36ce973 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,12 +5,13 @@ set(CMAKE_BUILD_TYPE, Debug)
 
 include(FindPkgConfig)
 include(CMakeDependentOption)
+include(GNUInstallDirs)
 
 set(PROJECT_NAME "automotive-message-broker")
 set(PROJECT_PRETTY_NAME "Automotive Message Broker")
 set(PROJECT_SERIES "0.15")
 set(PROJECT_MAJOR_VERSION "0.14")
-set(PROJECT_MINOR_VERSION "802")
+set(PROJECT_MINOR_VERSION "803")
 set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}")
 set(PROJECT_CODENAME "")
 set(PROJECT_QUALITY "alpha")
@@ -22,11 +23,13 @@ add_definitions(-DPROJECT_QUALITY="${PROJECT_QUALITY}")
 add_definitions(-DPROJECT_SERIES="${PROJECT_SERIES}")
 
 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}/${PROJECT_NAME}")
-set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
-set (DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/packages/${PROJECT_NAME}/${PROJECT_SERIES}")
-set (PLUGIN_SEGMENT_INSTALL_PATH "/etc/ambd/plugins.d")
+set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" )
+set (PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
+if (NOT DEFINED INCLUDE_INSTALL_DIR)
+       set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+set (DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME}/${PROJECT_SERIES}")
+set (PLUGIN_SEGMENT_INSTALL_PATH "${CMAKE_INSTALL_SYSCONFDIR}/ambd/plugins.d")
 
 option(qtmainloop "Use QCoreApplication mainloop " OFF)
 option(websocket_plugin "websocket source and sink plugins" OFF)
@@ -52,17 +55,16 @@ set(QMAKE_INSTALL_PATH "/usr/bin/qmake" CACHE PATH "qmake executable path")
 
 #turn on -fpic/-fpie:
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpie -pie -std=c++1y")
-
-include (CMakeForceCompiler)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpie -pie -std=c++14")
 
 if (enable_icecc)
-        find_program(ICECC /usr/lib/icecc/bin/g++)
+       include (CMakeForceCompiler)
+       find_program(ICECC /usr/lib/icecc/bin/g++)
                if (ICECC)
-                               message(STATUS "icecc will be used for distributed compiling")
-                               cmake_force_cxx_compiler(${ICECC} icecc)
+                       message(STATUS "icecc will be used for distributed compiling")
+                       cmake_force_cxx_compiler(${ICECC} icecc)
                else(ICECC)
-                               message(STATUS "Not using icecc")
+                       message(STATUS "Not using icecc")
                endif(ICECC)
 endif(enable_icecc)
 
@@ -81,6 +83,15 @@ if(usebluez5)
 
 endif(usebluez5)
 
+include(CheckCSourceCompiles)
+check_c_source_compiles("
+        #include <linux/can/bcm.h>
+        int main() { struct bcm_timeval t; return 0;}" have_bcm_timeval)
+
+if(have_bcm_timeval)
+        add_definitions(-DHAVE_BCM_TIMEVAL)
+endif(have_bcm_timeval)
+
 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
 add_custom_target(dist COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})