diff options
| author | Stefan Vacek <stefan.vacek@intel.com> | 2015-08-28 16:59:52 +0200 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-10-07 10:36:13 +0200 |
| commit | e5ffa017047525ed2e3ee41ea2294546ee64894c (patch) | |
| tree | a3e431ffc19163ff8a54abae752e6063060789e3 /CMakeLists.txt | |
| parent | cd35815e6870df9b8db0da807c4d4db3607539ba (diff) | |
| download | DLT-daemon-e5ffa017047525ed2e3ee41ea2294546ee64894c.tar.gz | |
Add C++ extension
- header only implementation, uses variadic templates from C++ 11
- Enable installation and building tests with -DWITH_DLT_CXX11_EXT
- allow logging in the form of DLT_LOG_CXX(context, level, param1, param2, param3), e.g.
- allow logging of user types (if a function logToDlt for the given user-type is present), e.g.
- Added pkg-config file automotive-dlt-c++.pc
- Sample code is provided in tests/dlt-test-cpp-extension.cpp
Signed-off-by: Stefan Vacek <stefan.vacek@intel.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a036676..8497dc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ option(WITH_DLT_EXAMPLES "Set to ON to build src/examples binaries" option(WITH_DLT_SYSTEM "Set to ON to build src/system binaries" ON) option(WITH_DLT_DBUS "Set to ON to build src/dbus binaries" ON) option(WITH_DLT_TESTS "Set to ON to build src/test binaries" ON) +option(WITH_DLT_CXX11_EXT "Set to ON to build C++11 extensions" ON) # RPM settings set( GENIVI_RPM_RELEASE "1")#${DLT_REVISION}") set( LICENSE "Mozilla Public License Version 2.0" ) @@ -120,6 +121,11 @@ configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR} configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) +if(${WITH_DLT_CXX11_EXT}) + configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}-c++.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-c++.pc @ONLY) + install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-c++.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) +endif() + IF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") set(CONFIGURATION_FILES_DIR "/etc") ELSE() @@ -172,6 +178,7 @@ message( STATUS "WITH_DLT_DBUS = ${WITH_DLT_DBUS}") message( STATUS "WITH_DLT_TESTS = ${WITH_DLT_TESTS}") message( STATUS "WITH_DLT_SHM_ENABLE = ${WITH_DLT_SHM_ENABLE}" ) message( STATUS "WITH_DLTTEST = ${WITH_DLTTEST}" ) +message( STATUS "WITH_DLT_CXX11_EXT = ${WITH_DLT_CXX11_EXT}" ) message( STATUS "WITH_CHECK_CONFIG_FILE = ${WITH_CHECK_CONFIG_FILE}" ) message( STATUS "WITH_TESTSCRIPTS = ${WITH_TESTSCRIPTS}" ) message( STATUS "WITH_GPROF = ${WITH_GPROF}" ) |