From ccd018ae659d3298f8b20ca44f84084ab8f41877 Mon Sep 17 00:00:00 2001
From: Tadas Baltrusaitis <tadyla@gmail.com>
Date: Mon, 8 Jul 2019 17:09:21 +0100
Subject: [PATCH] Changing how filesystem includes are handled to support
 systems that have boost installed. (#738)

---
 install.sh                                  |  2 ++
 lib/local/FaceAnalyser/include/stdafx_fa.h  | 10 +++++-----
 lib/local/LandmarkDetector/include/stdafx.h | 10 +++++-----
 lib/local/Utilities/include/stdafx_ut.h     | 10 +++++-----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/install.sh b/install.sh
index f1ea9f935..cb01115bb 100755
--- a/install.sh
+++ b/install.sh
@@ -38,6 +38,8 @@ sudo apt-get -y install gcc-8 g++-8
 
 # Ubuntu 16.04 does not have newest CMake so need to build it manually
 if [[ `lsb_release -rs` != "18.04" ]]; then   
+  sudo apt-get --purge remove cmake-qt-gui -y
+  sudo apt-get --purge remove cmake -y
   mkdir -p cmake_tmp
   cd cmake_tmp
   wget https://cmake.org/files/v3.10/cmake-3.10.1.tar.gz
diff --git a/lib/local/FaceAnalyser/include/stdafx_fa.h b/lib/local/FaceAnalyser/include/stdafx_fa.h
index e90016305..2ba929c6a 100644
--- a/lib/local/FaceAnalyser/include/stdafx_fa.h
+++ b/lib/local/FaceAnalyser/include/stdafx_fa.h
@@ -42,16 +42,16 @@
 
 // Filesystem stuff
 // It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost
-#if __has_include(<filesystem>)
+#if __has_include(<boost/filesystem.hpp>)
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+namespace fs = boost::filesystem;
+#elif __has_include(<filesystem>)
 #include <filesystem>
 namespace fs = std::filesystem;
 #elif __has_include(<experimental/filesystem>)
 #include <experimental/filesystem>
 namespace fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-namespace fs = boost::filesystem;
 #endif
 
 #endif
diff --git a/lib/local/LandmarkDetector/include/stdafx.h b/lib/local/LandmarkDetector/include/stdafx.h
index 11a72f11a..d50e05bc7 100644
--- a/lib/local/LandmarkDetector/include/stdafx.h
+++ b/lib/local/LandmarkDetector/include/stdafx.h
@@ -42,16 +42,16 @@
 
 // Filesystem stuff
 // It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost
-#if __has_include(<filesystem>)
+#if __has_include(<boost/filesystem.hpp>)
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+namespace fs = boost::filesystem;
+#elif __has_include(<filesystem>)
 #include <filesystem>
 namespace fs = std::filesystem;
 #elif __has_include(<experimental/filesystem>)
 #include <experimental/filesystem>
 namespace fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-namespace fs = boost::filesystem;
 #endif
 
 // OpenBLAS stuff
diff --git a/lib/local/Utilities/include/stdafx_ut.h b/lib/local/Utilities/include/stdafx_ut.h
index 714f4ac6b..e439e08c5 100644
--- a/lib/local/Utilities/include/stdafx_ut.h
+++ b/lib/local/Utilities/include/stdafx_ut.h
@@ -47,16 +47,16 @@
 
 // Filesystem stuff
 // It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost
-#if __has_include(<filesystem>)
+#if __has_include(<boost/filesystem.hpp>)
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+namespace fs = boost::filesystem;
+#elif __has_include(<filesystem>)
 #include <filesystem>
 namespace fs = std::filesystem;
 #elif __has_include(<experimental/filesystem>)
 #include <experimental/filesystem>
 namespace fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-namespace fs = boost::filesystem;
 #endif
 
 #endif