From 6b814115615b26b44fab3195d57b5d57ae63b92d Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga@tiscali.it>
Date: Mon, 5 Jun 2017 17:59:36 +0200
Subject: [PATCH] Use option to let user choose to use system's KLT

---
 CMakeLists.txt          | 5 ++++-
 rtengine/CMakeLists.txt | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2efcd619b..b77b688e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,7 +256,10 @@ find_package (JPEG REQUIRED)
 find_package (PNG REQUIRED)
 find_package (TIFF REQUIRED)
 find_package (ZLIB REQUIRED)
-find_package (KLT)
+option(USE_SYSTEM_KLT "Enable this option here or in cmake call if you want to use system's KLT libraries." OFF)
+if (USE_SYSTEM_KLT)
+  find_package (KLT REQUIRED)
+endif(USE_SYSTEM_KLT)
 
 # link witz bzip
 if (WITH_BZIP)
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index 734780a06..a30c19d2d 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -24,7 +24,7 @@ set (RTENGINESOURCEFILES colortemp.cc curves.cc flatcurves.cc diagonalcurves.cc
     ciecam02.cc
     )
 
-if (NOT KLT_FOUND)
+if (NOT USE_SYSTEM_KLT)
     set (RTENGINESOURCEFILES ${RTENGINESOURCEFILES}
 	klt/convolve.cc klt/error.cc klt/klt.cc klt/klt_util.cc klt/pnmio.cc klt/pyramid.cc klt/selectGoodFeatures.cc
 	klt/storeFeatures.cc klt/trackFeatures.cc klt/writeFeatures.cc