diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-02-09 16:05:16 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-02-09 16:05:16 +0100 |
| commit | 57345f36fa6095ecb6d7f7998a06abafbcd90a87 (patch) | |
| tree | 7d8004dafb727f312189007eae462fb487a81724 /gnss-service | |
| parent | 43c37bba55cd2ffdbd4aec5f1a5583446c12190a (diff) | |
| download | positioning-57345f36fa6095ecb6d7f7998a06abafbcd90a87.tar.gz | |
refine CMakeLists.txt to allow DLT build, tests OK
Diffstat (limited to 'gnss-service')
| -rw-r--r-- | gnss-service/FindDLT.cmake | 30 | ||||
| -rw-r--r-- | gnss-service/src/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | gnss-service/test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gnss-service/test/compliance-test/CMakeLists.txt | 3 |
4 files changed, 3 insertions, 36 deletions
diff --git a/gnss-service/FindDLT.cmake b/gnss-service/FindDLT.cmake deleted file mode 100644 index 3743cd7..0000000 --- a/gnss-service/FindDLT.cmake +++ /dev/null @@ -1,30 +0,0 @@ -########################################################################### -# @licence app begin@ -# SPDX-License-Identifier: MPL-2.0 -# -# Component Name: GNSSService -# -# 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/gnss-service/src/CMakeLists.txt b/gnss-service/src/CMakeLists.txt index ccbe26f..3e58ace 100644 --- a/gnss-service/src/CMakeLists.txt +++ b/gnss-service/src/CMakeLists.txt @@ -35,8 +35,7 @@ set(LIBRARIES pthread m) if(WITH_DLT) add_definitions("-DDLT_ENABLED=1") - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}") - find_package(DLT REQUIRED) + pkg_check_modules(DLT REQUIRED automotive-dlt) include_directories( ${DLT_INCLUDE_DIRS} ) set(LIBRARIES ${LIBRARIES} ${DLT_LIBRARIES}) endif() diff --git a/gnss-service/test/CMakeLists.txt b/gnss-service/test/CMakeLists.txt index dff5617..8924a98 100755 --- a/gnss-service/test/CMakeLists.txt +++ b/gnss-service/test/CMakeLists.txt @@ -47,8 +47,7 @@ endif() if(WITH_DLT) add_definitions("-DDLT_ENABLED=1") - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}") - find_package(DLT REQUIRED) + pkg_check_modules(DLT REQUIRED automotive-dlt) include_directories( ${DLT_INCLUDE_DIRS} ) set(LIBRARIES ${LIBRARIES} ${DLT_LIBRARIES}) endif() diff --git a/gnss-service/test/compliance-test/CMakeLists.txt b/gnss-service/test/compliance-test/CMakeLists.txt index 3e30b7c..1a8699b 100644 --- a/gnss-service/test/compliance-test/CMakeLists.txt +++ b/gnss-service/test/compliance-test/CMakeLists.txt @@ -48,8 +48,7 @@ endif() if(WITH_DLT) add_definitions("-DDLT_ENABLED=1") - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}") - find_package(DLT REQUIRED) + pkg_check_modules(DLT REQUIRED automotive-dlt) include_directories( ${DLT_INCLUDE_DIRS} ) set(LIBRARIES ${LIBRARIES} ${DLT_LIBRARIES}) endif() |