diff options
-rw-r--r-- | AudioManagerUtilities/CMakeLists.txt | 10 | ||||
-rw-r--r-- | AudioManagerUtilities/include/CAmDltWrapper.h | 7 | ||||
-rw-r--r-- | cmake/MacroVersionFromGit.cmake | 36 | ||||
-rw-r--r-- | googleMock/CMakeLists.txt | 2 | ||||
-rw-r--r-- | googleMock/gtest/CMakeLists.txt | 2 |
5 files changed, 23 insertions, 34 deletions
diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index 5933e4b..6e9a06f 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -109,16 +109,6 @@ IF (WITH_DLT) add_definitions(${DLT_CFLAGS_OTHER}) - set (DLT_VERSIONING ${DLT_VERSION}) - string (REPLACE "." ";" DLT_VERSIONING ${DLT_VERSIONING}) - list (LENGTH DLT_VERSIONING size) - - if (size GREATER "1") - list (GET DLT_VERSIONING 0 DLT_MAJOR_VERSION) - list (GET DLT_VERSIONING 1 DLT_MINOR_VERSION) - add_definitions (-DDLT_MAJOR_VERSION=${DLT_MAJOR_VERSION} -DDLT_MINOR_VERSION=${DLT_MINOR_VERSION}) - endif (size GREATER "1") - set(AUDIO_MANAGER_UTILITIES_LIBS ${AUDIO_MANAGER_UTILITIES_LIBS} ${DLT_LIBRARIES} diff --git a/AudioManagerUtilities/include/CAmDltWrapper.h b/AudioManagerUtilities/include/CAmDltWrapper.h index a37ec77..8c5678e 100644 --- a/AudioManagerUtilities/include/CAmDltWrapper.h +++ b/AudioManagerUtilities/include/CAmDltWrapper.h @@ -161,10 +161,11 @@ public: bool checkLogLevel(DltLogLevelType logLevel) { #ifdef WITH_DLT - #if (DLT_MAJOR_VERSION >= 2 && DLT_MINOR_VERSION >= 16) - return (1 == dlt_user_is_logLevel_enabled(&mDltContext,logLevel)? true: false); + #ifdef DLT_IS_LOG_LEVEL_ENABLED + return (dlt_user_is_logLevel_enabled(&mDltContext, logLevel) == DLT_RETURN_TRUE); #else - return false; + (void)logLevel; + return true; #endif #else return (logLevel <= mDltContext.log_level_user); diff --git a/cmake/MacroVersionFromGit.cmake b/cmake/MacroVersionFromGit.cmake index 40c56e7..05a9030 100644 --- a/cmake/MacroVersionFromGit.cmake +++ b/cmake/MacroVersionFromGit.cmake @@ -3,34 +3,32 @@ execute_process(COMMAND git tag WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE TAG_LIST OUTPUT_STRIP_TRAILING_WHITESPACE) - -IF(TAG_LIST) - STRING (REPLACE "\n" ";" TAG_LIST ${TAG_LIST}) +IF (TAG_LIST AND NOT VERSION) + STRING (REPLACE "\n" ";" TAG_LIST ${TAG_LIST}) - set (VERSION_LIST) + set (VERSION_LIST) - foreach (element ${TAG_LIST}) - STRING (REGEX MATCH "^[0-9]+\\.." SINGLE_VERSION ${element}) - LIST (APPEND VERSION_LIST ${SINGLE_VERSION}) - endforeach (element) + foreach (element ${TAG_LIST}) + STRING (REGEX MATCH "^[0-9]+\\.." SINGLE_VERSION ${element}) + LIST (APPEND VERSION_LIST ${SINGLE_VERSION}) + endforeach (element) - LIST (REVERSE VERSION_LIST) + LIST (REVERSE VERSION_LIST) - LIST (GET VERSION_LIST 0 VERSION_MISSING_MINOR) + LIST (GET VERSION_LIST 0 VERSION_MISSING_MINOR) - execute_process(COMMAND git --no-pager log --pretty=oneline HEAD...${VERSION_MISSING_MINOR} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE COMMIT_LIST - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND git --no-pager log --pretty=oneline HEAD...${VERSION_MISSING_MINOR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE COMMIT_LIST + OUTPUT_STRIP_TRAILING_WHITESPACE) - STRING (REPLACE "\n" ";" COMMIT_LIST ${COMMIT_LIST}) + STRING (REPLACE "\n" ";" COMMIT_LIST ${COMMIT_LIST}) - LIST (LENGTH COMMIT_LIST MINOR_VERSION) + LIST (LENGTH COMMIT_LIST MINOR_VERSION) - SET (DAEMONVERSION "${VERSION_MISSING_MINOR}.${MINOR_VERSION}") - -ENDIF(TAG_LIST) + SET (DAEMONVERSION "${VERSION_MISSING_MINOR}.${MINOR_VERSION}") +ENDIF (TAG_LIST AND NOT VERSION) if (NOT DAEMONVERSION) #Can be changed via passing -DVERSION="XXX" to cmake diff --git a/googleMock/CMakeLists.txt b/googleMock/CMakeLists.txt index 82e16c2..af80590 100644 --- a/googleMock/CMakeLists.txt +++ b/googleMock/CMakeLists.txt @@ -87,7 +87,7 @@ cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc) target_link_libraries(gmock_main gmock) INSTALL(TARGETS gmock gmock_main - ARCHIVE DESTINATION lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev) INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/googleMock/include/gmock" DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ diff --git a/googleMock/gtest/CMakeLists.txt b/googleMock/gtest/CMakeLists.txt index 133316c..37f29cb 100644 --- a/googleMock/gtest/CMakeLists.txt +++ b/googleMock/gtest/CMakeLists.txt @@ -72,7 +72,7 @@ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) target_link_libraries(gtest_main gtest) INSTALL(TARGETS gtest gtest_main - ARCHIVE DESTINATION lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev) INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/googleMock/gtest/include/gtest" DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ |