From 3e4f98bef4bef7c2bbe4ce7de644746506b1f25b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Feb 2020 14:40:00 +0100 Subject: [PATCH 1/2] Fix headers for opencv2 and later opencv/cv.h is removed on opencv4 Signed-off-by: Nicolas Chauvet --- wrappers/opencv/cvdemo.cpp | 3 +-- wrappers/opencv/libfreenect_cv.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wrappers/opencv/cvdemo.cpp b/wrappers/opencv/cvdemo.cpp index 94e8283d..742518a9 100644 --- a/wrappers/opencv/cvdemo.cpp +++ b/wrappers/opencv/cvdemo.cpp @@ -1,5 +1,4 @@ -#include -#include +#include #include #include "libfreenect_cv.h" diff --git a/wrappers/opencv/libfreenect_cv.h b/wrappers/opencv/libfreenect_cv.h index 55e3582c..a1a0ebc1 100644 --- a/wrappers/opencv/libfreenect_cv.h +++ b/wrappers/opencv/libfreenect_cv.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #ifdef __cplusplus extern "C" { From 79e357efa8a0a4d60ab8bb9e8d189f12ac4627d1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Feb 2020 14:54:47 +0100 Subject: [PATCH 2/2] Drop PROJECT_VER_MINOR in APIVER This will change SONAME to libfreenect.so.0 instead of 0.6 Signed-off-by: Nicolas Chauvet --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e71ea975..37d6e948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ set (PROJECT_VER_PATCH 1) set (PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}") set (PROJECT_APIVER - "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}") + "${PROJECT_VER_MAJOR}") OPTION(BUILD_REDIST_PACKAGE "Build libfreenect in a legally-redistributable manner (only affects audio)" ON) OPTION(BUILD_EXAMPLES "Build example programs" ON)