From c85279ca9ad3c0f32dd9fb10897c96e632e8420f Mon Sep 17 00:00:00 2001 From: Nicolas Burrus Date: Wed, 17 Apr 2013 09:13:59 -0700 Subject: [PATCH] Integrate openni2. --- CMakeLists.txt | 10 +++++++++- nestk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28bcaf4..c1e5bdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,10 @@ IF (NOT DEFINED NESTK_USE_OPENNI) SET(NESTK_USE_OPENNI 1) ENDIF() +IF (NOT DEFINED NESTK_USE_OPENNI2) + SET(NESTK_USE_OPENNI2 1) +ENDIF() + IF (NOT DEFINED NESTK_USE_PCL) SET(NESTK_USE_PCL 1) ENDIF() @@ -53,7 +57,11 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) ADD_SUBDIRECTORY(calibration) ADD_SUBDIRECTORY(viewer) -ADD_SUBDIRECTORY(reconstructor) + +IF (NESTK_USE_PCL) + ADD_SUBDIRECTORY(reconstructor) +ENDIF() + ADD_SUBDIRECTORY(people-tracker) IF (NESTK_USE_OPENNI AND NESTK_USE_NITE) diff --git a/nestk b/nestk index d820b42..6c45d77 160000 --- a/nestk +++ b/nestk @@ -1 +1 @@ -Subproject commit d820b4241dcacf2150a7ae2b1c66b5a242464c98 +Subproject commit 6c45d776389b36d394b6f2c21caf355539ec5013