diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-02-06 14:49:34 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-02-06 14:49:34 +0100 |
| commit | f9a22630a2b330af43a9c15b296d0cd7beec029a (patch) | |
| tree | 1e296ac07dc18988b59ab18af122e55c78e1fedc | |
| parent | a538ee2b2f024787ad188e840a9935dba37fe4c8 (diff) | |
| download | positioning-f9a22630a2b330af43a9c15b296d0cd7beec029a.tar.gz | |
update .cmake files and fix error into .gitignore
| -rw-r--r-- | enhanced-position-service/.gitignore | 2 | ||||
| -rw-r--r-- | enhanced-position-service/dbus/FindDLT.cmake | 30 | ||||
| -rw-r--r-- | enhanced-position-service/franca/FindDLT.cmake | 30 | ||||
| -rw-r--r-- | gnss-service/FindDLT.cmake | 4 | ||||
| -rw-r--r-- | log-replayer/FindDLT.cmake | 4 | ||||
| -rw-r--r-- | sensors-service/FindDLT.cmake | 4 |
6 files changed, 67 insertions, 7 deletions
diff --git a/enhanced-position-service/.gitignore b/enhanced-position-service/.gitignore index d0cf84f..e53ff5a 100644 --- a/enhanced-position-service/.gitignore +++ b/enhanced-position-service/.gitignore @@ -1,3 +1,3 @@ *.user -*.cmake + diff --git a/enhanced-position-service/dbus/FindDLT.cmake b/enhanced-position-service/dbus/FindDLT.cmake new file mode 100644 index 0000000..8fedea1 --- /dev/null +++ b/enhanced-position-service/dbus/FindDLT.cmake @@ -0,0 +1,30 @@ +########################################################################### +# @licence app begin@ +# SPDX-License-Identifier: MPL-2.0 +# +# Component Name: EnhancedPositionService +# +# Author: Marco Residori +# +# Copyright (C) 2014, XS Embedded GmbH +# +# License: +# This Source Code Form is subject to the terms of the +# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# @licence end@ +########################################################################### + +set(DLT_INCLUDE_DIRS /usr/local/include/dlt) +set(DLT_LIBRARIES dlt) +set(DLT_LIBRARY_DIRS /usr/local/lib) + +find_package(PkgConfig) +pkg_check_modules(DLT REQUIRED automotive-dlt) + +if(${DLT_FOUND}) + #message(STATUS "found and use automotive-dlt: version ${DLT_VERSION}") +else() + message("missing DLT - check with 'pkg-config automotive-dlt --cflags-only-I'") +endif() diff --git a/enhanced-position-service/franca/FindDLT.cmake b/enhanced-position-service/franca/FindDLT.cmake new file mode 100644 index 0000000..354f1d5 --- /dev/null +++ b/enhanced-position-service/franca/FindDLT.cmake @@ -0,0 +1,30 @@ +########################################################################### +# @licence app begin@ +# SPDX-License-Identifier: MPL-2.0 +# +# Component Name: EnhancedPositionService +# +# Author: Marco Residori +# +# Copyright (C) 2014, XS Embedded GmbH +# +# License: +# This Source Code Form is subject to the terms of the +# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# @licence end@ +########################################################################### + +set(DLT_INCLUDE_DIRS /usr/include/dlt) +set(DLT_LIBRARIES dlt) +set(DLT_LIBRARY_DIRS /usr/lib) + +find_package(PkgConfig) +pkg_check_modules(DLT REQUIRED automotive-dlt) + +if(${DLT_FOUND}) + #message(STATUS "found and use automotive-dlt: version ${DLT_VERSION}") +else() + message("missing DLT - check with 'pkg-config automotive-dlt --cflags-only-I'") +endif() diff --git a/gnss-service/FindDLT.cmake b/gnss-service/FindDLT.cmake index 039e4c8..3743cd7 100644 --- a/gnss-service/FindDLT.cmake +++ b/gnss-service/FindDLT.cmake @@ -16,9 +16,9 @@ # @licence end@ ########################################################################### -set(DLT_INCLUDE_DIRS /usr/include/dlt) +set(DLT_INCLUDE_DIRS /usr/local/include/dlt) set(DLT_LIBRARIES dlt) -set(DLT_LIBRARY_DIRS /usr/lib) +set(DLT_LIBRARY_DIRS /usr/local/lib) find_package(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) diff --git a/log-replayer/FindDLT.cmake b/log-replayer/FindDLT.cmake index c92aba9..a52cdf6 100644 --- a/log-replayer/FindDLT.cmake +++ b/log-replayer/FindDLT.cmake @@ -16,9 +16,9 @@ # @licence end@ ########################################################################### -set(DLT_INCLUDE_DIRS /usr/include/dlt) +set(DLT_INCLUDE_DIRS /usr/local/include/dlt) set(DLT_LIBRARIES dlt) -set(DLT_LIBRARY_DIRS /usr/lib) +set(DLT_LIBRARY_DIRS /usr/local/lib) find_package(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) diff --git a/sensors-service/FindDLT.cmake b/sensors-service/FindDLT.cmake index d34aa0d..cb3e93a 100644 --- a/sensors-service/FindDLT.cmake +++ b/sensors-service/FindDLT.cmake @@ -16,9 +16,9 @@ # @licence end@ ########################################################################### -set(DLT_INCLUDE_DIRS /usr/include/dlt) +set(DLT_INCLUDE_DIRS /usr/local/include/dlt) set(DLT_LIBRARIES dlt) -set(DLT_LIBRARY_DIRS /usr/lib) +set(DLT_LIBRARY_DIRS /usr/local/lib) find_package(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) |