Merge branch 'rpi' of https://github.com/adrianiainlam/mouse-tracker-for-cubism into rpi

The CMake min version change was somehow missing in my local tree

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f591f8..dc1bb34 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.13)
 
 project(MouseTrackerForCubism_project)
 

diff --git a/build.sh b/build.sh
index 74c4d25..8d99c0f 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -3,4 +3,4 @@
 mkdir -p build && cd build
 
 cmake .. -D CMAKE_BUILD_TYPE=Release
-cmake --build . -j6
+cmake --build . -j 6

diff --git a/example/demo.patch b/example/demo.patch
index e7d5114..10395d7 100644 (file)
--- a/example/demo.patch
+++ b/example/demo.patch
@@ -1,7 +1,10 @@
 diff -pruN --exclude build ./demo_clean/CMakeLists.txt ./demo_dev/CMakeLists.txt
 --- ./demo_clean/CMakeLists.txt        2021-02-17 01:23:17.000000000 +0000
 +++ ./demo_dev/CMakeLists.txt  2021-04-28 12:32:48.468744883 +0100
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
+@@ -1,9 +1,9 @@
+-cmake_minimum_required(VERSION 3.16)
++cmake_minimum_required(VERSION 3.13)
+ 
  # Set app name.
  set(APP_NAME Demo)
  # Set directory paths.