diff options
| author | Kevron Rees <tripzero.kev@gmail.com> | 2015-11-17 01:45:25 -0800 |
|---|---|---|
| committer | Kevron Rees <tripzero.kev@gmail.com> | 2015-11-17 01:45:25 -0800 |
| commit | 6de29621fbcb7baa5955bdd2dcfc8a990e792f5f (patch) | |
| tree | 2138b554c58ae2dcc72fec6adbe2dddf27127df7 | |
| parent | 58569fac42bb8b6e1ad208caef5db8a51befc87f (diff) | |
| parent | e480af61dc4ba531c8113d54bb859d8fc409a1ee (diff) | |
| download | automotive-message-broker-6de29621fbcb7baa5955bdd2dcfc8a990e792f5f.tar.gz | |
Merge pull request #63 from tripzero/trip
cmake: explicitly set std to c++14
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c61454a..26b49337 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_BUILD_TYPE, Debug) include(FindPkgConfig) include(CMakeDependentOption) +include(GNUInstallDirs) set(PROJECT_NAME "automotive-message-broker") set(PROJECT_PRETTY_NAME "Automotive Message Broker") @@ -22,11 +23,11 @@ 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 (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) 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 (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") +set (DOC_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}/${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 +53,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) |