Use OPENNI2_INCLUDE64 environment variable.
(Set on windows with install from http://structure.io/openni).
Merge remote-tracking branch 'upstream/master' into daniel
Merge pull request #3424 from dsjolie:daniel