Improvement including OpenNI2

MarianoJT88 · Jan 16, 2015 · 153e739 · 153e739
1 parent 761a44c
commit 153e739
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,7 +44,10 @@ IF (BUILD_RT_VISUALIZATION)
 	ENDIF (WIN32)
 
 	IF (UNIX)
-		SET(OpenNI_lib "/usr/lib/libOpenNI2.so")
+		SET(OpenNI2_libdir "/usr/lib")
+		INCLUDE_DIRECTORIES("/usr/include/openni2")
+		LINK_DIRECTORIES(${OpenNI2_libdir})
+		SET(OpenNI_lib "${OpenNI2_libdir}/libOpenNI2.so")
 	ENDIF (UNIX)
 
 	message( "esto vale $ENV{OPENNI2_INCLUDE}" )

diff --git a/scene_flow_visualization.h b/scene_flow_visualization.h
@@ -28,11 +28,7 @@
 #include <Eigen/src/Core/Matrix.h>
 #include "pdflow_cudalib.h"
 #include "legend_pdflow.xpm"
-#ifdef _WIN32
-    #include <OpenNI.h>
-#elif __linux
-    #include <openni2/OpenNI.h>
-#endif
+#include <OpenNI.h>
 
 #ifdef _WIN32
     inline float log2(const float x){ return  log(x) * M_LOG2E;}