merge with dev

2017-06-27 10:28:35 +02:00
parent acd715dd44 0ecb02afdd
commit dfffa2e8aa
45 changed files with 1074 additions and 400 deletions
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -112,6 +112,22 @@ set(RTENGINESOURCEFILES
    utils.cc
    )

+if(NOT WITH_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
+        )
+    set(KLT_LIBRARIES)
+endif()
+
 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")

 add_library(rtengine ${RTENGINESOURCEFILES})