 - 
 - 
 - 
--- 
-2.17.1
-

From 4e9b597ccd72ddfa97f3fc487ff265df37114d93 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Wed, 18 Dec 2019 11:11:30 -0800
Subject: [PATCH] Use libphidget22 from libphidget22-upstream and normal prefix

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---
 CMakeLists.txt                                | 34 +----------
 cmake/libphidget22-extras.cmake.in            |  4 +-
 ...ts22-fix-uninitialized-memory-access.patch | 56 -------------------
 3 files changed, 3 insertions(+), 91 deletions(-)
 delete mode 100644 patch/libphidgets22-fix-uninitialized-memory-access.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c19ed20..78ec0ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,39 +3,7 @@ project(libphidget22)
 
 find_package(ament_cmake REQUIRED)
 

-  DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/opt/libphidget22/include/libphidget22/
-)
-
-ament_environment_hooks(env_hook/libphidget22_library_path.sh)
+find_package(libphidget22)
 
 ament_package(CONFIG_EXTRAS "cmake/libphidget22-extras.cmake.in")
diff --git a/cmake/libphidget22-extras.cmake.in b/cmake/libphidget22-extras.cmake.in
index 7a386fa..ccf3d59 100644
--- a/cmake/libphidget22-extras.cmake.in
