diff options
author | asanoaozora <fifitaneki@hotmail.com> | 2016-06-17 16:12:09 +0200 |
---|---|---|
committer | asanoaozora <fifitaneki@hotmail.com> | 2016-06-17 16:12:09 +0200 |
commit | afd74c2978de340727b7890027acbe855def5821 (patch) | |
tree | 3aa78a2dc404fb8d7b30173b6033158b7e723215 /api | |
parent | 2d611927b31167b0d0f51dc3303f582985221b35 (diff) | |
download | poi-service-afd74c2978de340727b7890027acbe855def5821.tar.gz |
migration of poi add/remove POC to CommonAPI in progress
Diffstat (limited to 'api')
-rw-r--r-- | api/franca/README.md (renamed from api/franca/README) | 9 | ||||
-rw-r--r-- | api/franca/hmi/speechservice/CMakeLists.txt (renamed from api/franca/hmi/speechoutputservice/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | api/franca/hmi/speechservice/SpeechOutput.fidl (renamed from api/franca/hmi/speechoutputservice/SpeechOutput.fidl) | 0 | ||||
-rw-r--r-- | api/franca/navigation/freetextsearchservice/CMakeLists.txt | 2 | ||||
-rw-r--r-- | api/franca/navigation/mapviewer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | api/franca/navigation/navigationcore/CMakeLists.txt | 2 | ||||
-rw-r--r-- | api/franca/navigation/poiservice/CMakeLists.txt | 2 |
7 files changed, 15 insertions, 4 deletions
diff --git a/api/franca/README b/api/franca/README.md index c09d1e4..410d928 100644 --- a/api/franca/README +++ b/api/franca/README.md @@ -14,9 +14,10 @@ HOW TO GENERATE THE COMMON API FILES First you need to have generated the common api tools and the common api dbus tools. For example, to generate the whole set of stubs: -mkdir build -cd build -cmake -DCOMMONAPI_TOOL_DIR=<tools path> -DCOMMONAPI_DBUS_TOOL_DIR=<dbus tools path> ../ +```mkdir build``` +```cd build``` +```cmake -DCOMMONAPI_TOOL_DIR=<tools path> -DCOMMONAPI_DBUS_TOOL_DIR=<dbus tools path> ../``` To generate part of the stubs, for example the stubs for poi service: -cmake -DCOMMONAPI_TOOL_DIR=<tools path> -DCOMMONAPI_DBUS_TOOL_DIR=<dbus tools path> ../ +```cmake -DCOMMONAPI_TOOL_DIR=<tools path> -DCOMMONAPI_DBUS_TOOL_DIR=<dbus tools path> ../ +```
\ No newline at end of file diff --git a/api/franca/hmi/speechoutputservice/CMakeLists.txt b/api/franca/hmi/speechservice/CMakeLists.txt index 94ec064..fb2dfd5 100644 --- a/api/franca/hmi/speechoutputservice/CMakeLists.txt +++ b/api/franca/hmi/speechservice/CMakeLists.txt @@ -32,6 +32,8 @@ option(COMMONAPI_DBUS_TOOL_DIR execute_process(COMMAND uname -i OUTPUT_VARIABLE OS_VERSION) if("${OS_VERSION}" MATCHES "i686") set(OS_VERSION "x86") +else() + set(OS_VERSION "x86_64") endif() message(STATUS "OS_VERSION = ${OS_VERSION}") diff --git a/api/franca/hmi/speechoutputservice/SpeechOutput.fidl b/api/franca/hmi/speechservice/SpeechOutput.fidl index fbd4a50..fbd4a50 100644 --- a/api/franca/hmi/speechoutputservice/SpeechOutput.fidl +++ b/api/franca/hmi/speechservice/SpeechOutput.fidl diff --git a/api/franca/navigation/freetextsearchservice/CMakeLists.txt b/api/franca/navigation/freetextsearchservice/CMakeLists.txt index 06c73c7..ec1cb82 100644 --- a/api/franca/navigation/freetextsearchservice/CMakeLists.txt +++ b/api/franca/navigation/freetextsearchservice/CMakeLists.txt @@ -32,6 +32,8 @@ option(COMMONAPI_DBUS_TOOL_DIR execute_process(COMMAND uname -i OUTPUT_VARIABLE OS_VERSION) if("${OS_VERSION}" MATCHES "i686") set(OS_VERSION "x86") +else() + set(OS_VERSION "x86_64") endif() message(STATUS "OS_VERSION = ${OS_VERSION}") diff --git a/api/franca/navigation/mapviewer/CMakeLists.txt b/api/franca/navigation/mapviewer/CMakeLists.txt index c8e9247..7e8049d 100644 --- a/api/franca/navigation/mapviewer/CMakeLists.txt +++ b/api/franca/navigation/mapviewer/CMakeLists.txt @@ -32,6 +32,8 @@ option(COMMONAPI_DBUS_TOOL_DIR execute_process(COMMAND uname -i OUTPUT_VARIABLE OS_VERSION) if("${OS_VERSION}" MATCHES "i686") set(OS_VERSION "x86") +else() + set(OS_VERSION "x86_64") endif() message(STATUS "OS_VERSION = ${OS_VERSION}") diff --git a/api/franca/navigation/navigationcore/CMakeLists.txt b/api/franca/navigation/navigationcore/CMakeLists.txt index 5e0fc22..91cc5cc 100644 --- a/api/franca/navigation/navigationcore/CMakeLists.txt +++ b/api/franca/navigation/navigationcore/CMakeLists.txt @@ -32,6 +32,8 @@ option(COMMONAPI_DBUS_TOOL_DIR execute_process(COMMAND uname -i OUTPUT_VARIABLE OS_VERSION) if("${OS_VERSION}" MATCHES "i686") set(OS_VERSION "x86") +else() + set(OS_VERSION "x86_64") endif() message(STATUS "OS_VERSION = ${OS_VERSION}") diff --git a/api/franca/navigation/poiservice/CMakeLists.txt b/api/franca/navigation/poiservice/CMakeLists.txt index 758c224..1323e47 100644 --- a/api/franca/navigation/poiservice/CMakeLists.txt +++ b/api/franca/navigation/poiservice/CMakeLists.txt @@ -32,6 +32,8 @@ option(COMMONAPI_DBUS_TOOL_DIR execute_process(COMMAND uname -i OUTPUT_VARIABLE OS_VERSION) if("${OS_VERSION}" MATCHES "i686") set(OS_VERSION "x86") +else() + set(OS_VERSION "x86_64") endif() message(STATUS "OS_VERSION = ${OS_VERSION}") |