From d528f282305b24484861d8913c96c222621cf18c Mon Sep 17 00:00:00 2001
From: Stéphane Lenclud <github@lenclud.com>
Date: Sat, 2 Feb 2019 02:12:30 +0100
Subject: Kinect: Improved CMake configuration for Kinect SDK.

---
 tracker-kinect-face/CMakeLists.txt | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'tracker-kinect-face/CMakeLists.txt')

diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index d139b445..9a37f2d8 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -1,6 +1,29 @@
 
+# Setup cache variable to Kinect SDK path
 if(DEFINED ENV{KINECTSDK20_DIR})
+	set(KINECTSDK20_DIR $ENV{KINECTSDK20_DIR} CACHE PATH $ENV{KINECTSDK20_DIR})
+else()
+	set(KINECTSDK20_DIR $ENV{KINECTSDK20_DIR} CACHE PATH "")
+endif()
+
+# If we have a valid SDK path, try build that tracker
+if(EXISTS ${KINECTSDK20_DIR})
+	# Register our module
     otr_module(tracker-kinect-face)
-	target_include_directories(opentrack-tracker-kinect-face SYSTEM PUBLIC $ENV{KINECTSDK20_DIR}inc)
-	target_link_libraries(opentrack-tracker-kinect-face $ENV{KINECTSDK20_DIR}lib/x86/kinect20.lib $ENV{KINECTSDK20_DIR}lib/x86/kinect20.face.lib)
+
+	# Add include path to Kinect SDK 
+	target_include_directories(opentrack-tracker-kinect-face SYSTEM PUBLIC ${KINECTSDK20_DIR}/inc)
+	
+	# Check processor architecture 
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+		# 32 bits        
+		set (kinect-arch-dir "x86")
+    elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		# 64 bits
+		set (kinect-arch-dir "x64")		
+    endif()
+	
+	# Link against Kinect SDK libraries
+	target_link_libraries(opentrack-tracker-kinect-face ${KINECTSDK20_DIR}/lib/${kinect-arch-dir}/kinect20.lib ${KINECTSDK20_DIR}/lib/${kinect-arch-dir}/kinect20.face.lib)
+
 endif()
-- 
cgit v1.2.3