diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-20 15:59:19 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-20 15:59:19 +0100 |
| commit | 75c6816274fa18e14146ac016c7e70160e3c9e2b (patch) | |
| tree | ea6c23f634b4ad0d35d9a969227f121f172f4aac | |
| parent | bcb06c7739c7a8c021a357a36fdee943f216fd28 (diff) | |
| download | audiomanager-75c6816274fa18e14146ac016c7e70160e3c9e2b.tar.gz | |
* enhanced documentation
* [GAM-39] fixed bug in build system
| -rw-r--r-- | AudioManagerDaemon/docx/03_architecture_overview.dox | 4 | ||||
| -rw-r--r-- | AudioManagerDaemon/docx/images/Interacton_Overview.png | bin | 0 -> 62617 bytes | |||
| -rw-r--r-- | AudioManagerDaemon/docx/images/daemon_insight.png | bin | 0 -> 33062 bytes | |||
| -rw-r--r-- | CMakeLists.txt | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/AudioManagerDaemon/docx/03_architecture_overview.dox b/AudioManagerDaemon/docx/03_architecture_overview.dox index c2a4091..ec399f2 100644 --- a/AudioManagerDaemon/docx/03_architecture_overview.dox +++ b/AudioManagerDaemon/docx/03_architecture_overview.dox @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -76,4 +76,4 @@ For every gateway, a controlDomain is defined, this is the domain that registere the "other end" of the gateway might be unknown. To handle this situation, a domain can "peek" Domains, Sources and Sinks. When something is peeked, it means that an ID is reserved for a unique name without registering it.\n If a gateway is deregistered, the source or sink of the controlling domain is deregistered as well - not the one in the "other" domain. -*/
\ No newline at end of file +*/ diff --git a/AudioManagerDaemon/docx/images/Interacton_Overview.png b/AudioManagerDaemon/docx/images/Interacton_Overview.png Binary files differnew file mode 100644 index 0000000..023b1c0 --- /dev/null +++ b/AudioManagerDaemon/docx/images/Interacton_Overview.png diff --git a/AudioManagerDaemon/docx/images/daemon_insight.png b/AudioManagerDaemon/docx/images/daemon_insight.png Binary files differnew file mode 100644 index 0000000..7f4f160 --- /dev/null +++ b/AudioManagerDaemon/docx/images/daemon_insight.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f0e036..0edb882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,12 +22,12 @@ execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SO OUTPUT_VARIABLE DAEMONVERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -IF (DAEMON_ERROR) +IF (NOT DAEMONVERSION) SET( DAEMONVERSION "homebrew-${CMAKE_SOURCE_DIR}" ) -ELSE (DAEMON_ERROR) +ELSE (NOT DAEMONVERSION) STRING(REGEX REPLACE "(-)[^-]+$" "" DAEMONVERSION ${DAEMONVERSION}) STRING(REGEX REPLACE "-" "." DAEMONVERSION ${DAEMONVERSION}) -ENDIF(DAEMON_ERROR) +ENDIF(NOT DAEMONVERSION) message(STATUS "Build Version ${DAEMONVERSION}") |
