Merge pull request #611 from kwizart/cv_headers_soname

* Fix headers for opencv2 and later * Drop PROJECT_VER_MINOR in APIVER Reviewed-by: Benn Snyder <benn.snyder@gmail.com>
OpenKinect · Mar 3, 2020 · 7398a41 · 7398a41
2 parents 0ae4663 + 79e357e
commit 7398a41
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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)

diff --git a/wrappers/opencv/cvdemo.cpp b/wrappers/opencv/cvdemo.cpp
@@ -1,5 +1,4 @@
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <opencv2/highgui/highgui_c.h>
 #include <stdio.h>
 #include "libfreenect_cv.h"
 

diff --git a/wrappers/opencv/libfreenect_cv.h b/wrappers/opencv/libfreenect_cv.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <opencv/cv.h>
+#include <opencv2/core/core_c.h>
 
 #ifdef __cplusplus
 extern "C" {