5 files changed, 5 insertions, 69 deletions
diff --git a/enhanced-position-service/dbus/FindDLT.cmake b/enhanced-position-service/dbus/FindDLT.cmake
deleted file mode 100644
index 8fedea1..0000000
--- a/enhanced-position-service/dbus/FindDLT.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-###########################################################################
-# @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/dbus/src/CMakeLists.txt b/enhanced-position-service/dbus/src/CMakeLists.txt
index 8776e6b..ef97c02 100644
--- a/enhanced-position-service/dbus/src/CMakeLists.txt
+++ b/enhanced-position-service/dbus/src/CMakeLists.txt
@@ -64,8 +64,7 @@ set(LIBRARIES
 
 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/enhanced-position-service/dbus/test/CMakeLists.txt b/enhanced-position-service/dbus/test/CMakeLists.txt
index a254276..0a234cf 100644
--- a/enhanced-position-service/dbus/test/CMakeLists.txt
+++ b/enhanced-position-service/dbus/test/CMakeLists.txt
@@ -47,8 +47,7 @@ set(LIBRARIES
 
 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/enhanced-position-service/franca/FindDLT.cmake b/enhanced-position-service/franca/FindDLT.cmake
deleted file mode 100644
index 354f1d5..0000000
--- a/enhanced-position-service/franca/FindDLT.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-###########################################################################
-# @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/enhanced-position-service/franca/src/CMakeLists.txt b/enhanced-position-service/franca/src/CMakeLists.txt
index d98fb35..6f8b844 100755
--- a/enhanced-position-service/franca/src/CMakeLists.txt
+++ b/enhanced-position-service/franca/src/CMakeLists.txt
@@ -100,9 +100,8 @@ if (WITH_FRANCA_DBUS_INTERFACE)
 
     if(WITH_DLT)
         add_definitions("-DDLT_ENABLED=1")
-        set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/..")
-        find_package(DLT REQUIRED)
-        include_directories( ${DLT_INCLUDE_DIRS} )
+        pkg_check_modules(DLT REQUIRED automotive-dlt)
+       include_directories( ${DLT_INCLUDE_DIRS} )
         set(LIBRARIES ${LIBRARIES} ${DLT_LIBRARIES})
     endif()
 
@@ -185,8 +184,7 @@ if (WITH_FRANCA_SOMEIP_INTERFACE)
 
     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()