Merge pull request #875 from opentrack/kinect-copyright

Kinect: Copyright fix and minor cmake changes.

5 files changed, 27 insertions, 8 deletions

diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index 92ed00c1..8eb064e7 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -16,17 +16,17 @@ if (WIN32 AND opentrack-intel)
 		target_include_directories(${self} SYSTEM PRIVATE "${SDK_KINECT20}/inc")
 
 		# Check processor architecture
-		if(NOT opentrack-64bit)
-			# 32 bits
-			set(kinect-arch-dir "x86")
-		else()
-			# 64 bits
+		if(opentrack-64bit)
+            # 64 bits
 			set(kinect-arch-dir "x64")
+		else()
+            # 32 bits
+			set(kinect-arch-dir "x86")
 		endif()
 
 		# Link against Kinect SDK libraries
 		target_link_libraries(${self} "${SDK_KINECT20}/lib/${kinect-arch-dir}/Kinect20.lib" "${SDK_KINECT20}/lib/${kinect-arch-dir}/Kinect20.Face.lib")
-		# Link against OpenCV stuff, needed for video preview
+		# Link against video utilities, needed for video preview
 		target_link_libraries(${self} opentrack-video)
 
 		# Install Kinect Face DLL
diff --git a/tracker-kinect-face/kinect_face_settings.cpp b/tracker-kinect-face/kinect_face_settings.cpp
index c27b20bd..394bbe06 100644
--- a/tracker-kinect-face/kinect_face_settings.cpp
+++ b/tracker-kinect-face/kinect_face_settings.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, Stanislaw Halik <sthalik@misaki.pl>
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
 
  * Permission to use, copy, modify, and/or distribute this
  * software for any purpose with or without fee is hereby granted,
diff --git a/tracker-kinect-face/kinect_face_settings.h b/tracker-kinect-face/kinect_face_settings.h
index dfba3968..4a18cc3a 100644
--- a/tracker-kinect-face/kinect_face_settings.h
+++ b/tracker-kinect-face/kinect_face_settings.h
@@ -1,3 +1,11 @@
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #pragma once
 #include "ui_kinect_face_settings.h"
 #include "compat/macros.hpp"
diff --git a/tracker-kinect-face/kinect_face_tracker.cpp b/tracker-kinect-face/kinect_face_tracker.cpp
index d4cf89e3..e7b77133 100644
--- a/tracker-kinect-face/kinect_face_tracker.cpp
+++ b/tracker-kinect-face/kinect_face_tracker.cpp
@@ -1,4 +1,10 @@
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
 
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
 
 #include "kinect_face_tracker.h"
 
diff --git a/tracker-kinect-face/kinect_face_tracker.h b/tracker-kinect-face/kinect_face_tracker.h
index 3ed28bea..e708328d 100644
--- a/tracker-kinect-face/kinect_face_tracker.h
+++ b/tracker-kinect-face/kinect_face_tracker.h
@@ -1,5 +1,10 @@
+/* Copyright (c) 2019, Stéphane Lenclud <github@lenclud.com>
 
-
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
 
 #include <cmath>