Merge pull request #3016 from fradelg:master

cmake/OpenCVFindOpenNI2.cmake

@@ -21,13 +21,13 @@ if(WIN32)
         find_library(OPENNI2_LIBRARY "OpenNI2" PATHS $ENV{OPENNI2_LIB64} DOC "OpenNI2 library")
     endif()
 elseif(UNIX OR APPLE)
-    find_file(OPENNI_INCLUDES "OpenNI.h" PATHS "/usr/include/ni2" "/usr/include/openni2" DOC "OpenNI2 c++ interface header")
-    find_library(OPENNI_LIBRARY "OpenNI2" PATHS "/usr/lib" DOC "OpenNI2 library")
+    find_file(OPENNI2_INCLUDES "OpenNI.h" PATHS "/usr/include/ni2" "/usr/include/openni2" DOC "OpenNI2 c++ interface header")
+    find_library(OPENNI2_LIBRARY "OpenNI2" PATHS "/usr/lib" DOC "OpenNI2 library")
 endif()
 
 if(OPENNI2_LIBRARY AND OPENNI2_INCLUDES)
     set(HAVE_OPENNI2 TRUE)
-endif() #if(OPENNI_LIBRARY AND OPENNI_INCLUDES)
+endif() #if(OPENNI2_LIBRARY AND OPENNI2_INCLUDES)
 
 get_filename_component(OPENNI2_LIB_DIR "${OPENNI2_LIBRARY}" PATH)
 get_filename_component(OPENNI2_INCLUDE_DIR ${OPENNI2_INCLUDES} PATH)