ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2025-12-30 13:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into develop

Browse Source
This commit is contained in:
Tadas Baltrusaitis
2019-07-11 21:30:04 +01:00
parent de43686842 ccd018ae65
commit fece4572f0
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@@ -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 # Ubuntu 16.04 does not have newest CMake so need to build it manually
if [[ `lsb_release -rs` != "18.04" ]]; then 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 mkdir -p cmake_tmp
cd cmake_tmp cd cmake_tmp
wget https://cmake.org/files/v3.10/cmake-3.10.1.tar.gz wget https://cmake.org/files/v3.10/cmake-3.10.1.tar.gz

10
lib/local/FaceAnalyser/include/stdafx_fa.h
View File

@@ -42,16 +42,16 @@
// Filesystem stuff // Filesystem stuff
// It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost // 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> #include <filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>) #elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem> #include <experimental/filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#else
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
namespace fs = boost::filesystem;
#endif #endif
#endif #endif

10
lib/local/LandmarkDetector/include/stdafx.h
View File

@@ -42,16 +42,16 @@
// Filesystem stuff // Filesystem stuff
// It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost // 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> #include <filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>) #elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem> #include <experimental/filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#else
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
namespace fs = boost::filesystem;
#endif #endif
// OpenBLAS stuff // OpenBLAS stuff

10
lib/local/Utilities/include/stdafx_ut.h
View File

@@ -47,16 +47,16 @@
// Filesystem stuff // Filesystem stuff
// It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost // 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> #include <filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>) #elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem> #include <experimental/filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#else
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
namespace fs = boost::filesystem;
#endif #endif
#endif #endif