Dlib update preparation for OSX and Ubuntu.

.travis.yml

@@ -7,7 +7,7 @@ branches:
   only:
     - master
     - develop
-    - /^feature-.*$/
+    - /^feature/-.*$/
 compiler:
   - gcc
 

CMakeLists.txt

@@ -203,11 +203,8 @@ else()
 	INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
 endif()
 
-# dlib
-include_directories(lib/3rdParty/dlib/include)
-
 # dlib library
-add_subdirectory(lib/3rdParty/dlib)
+add_subdirectory(lib/3rdParty/dlib dlib)
 
 # LandmarkDetector library
 add_subdirectory(lib/local/LandmarkDetector)

appveyor.yml

@@ -3,7 +3,7 @@ branches:
   only:
   - develop
   - master
-  - /^feature-.*$/
+  - /^feature/-.*$/
 max_jobs: 4  
 configuration:
 - Release

exe/FaceLandmarkImg/CMakeLists.txt

@@ -18,8 +18,8 @@ target_link_libraries(FaceLandmarkImg LandmarkDetector)
 target_link_libraries(FaceLandmarkImg FaceAnalyser)
 target_link_libraries(FaceLandmarkImg GazeAnalyser)
 target_link_libraries(FaceLandmarkImg Utilities)
-target_link_libraries(FaceLandmarkImg dlib)
 
 target_link_libraries(FaceLandmarkImg ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
+target_link_libraries(FaceLandmarkImg ${DLIB_LIBRARY})
 
 install (TARGETS FaceLandmarkImg DESTINATION bin)

exe/FaceLandmarkVid/CMakeLists.txt

@@ -21,8 +21,7 @@ target_link_libraries(FaceLandmarkVid FaceAnalyser)
 target_link_libraries(FaceLandmarkVid GazeAnalyser)
 target_link_libraries(FaceLandmarkVid Utilities)
 
-target_link_libraries(FaceLandmarkVid dlib)
-
 target_link_libraries(FaceLandmarkVid ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
+target_link_libraries(FaceLandmarkVid ${DLIB_LIBRARY})
 
 install (TARGETS FaceLandmarkVid DESTINATION bin)

exe/FaceLandmarkVidMulti/CMakeLists.txt

@@ -16,10 +16,10 @@ include_directories(../../lib/local/Utilities/include)
 add_executable(FaceLandmarkVidMulti FaceLandmarkVidMulti.cpp)
 target_link_libraries(FaceLandmarkVidMulti LandmarkDetector)
 target_link_libraries(FaceLandmarkVidMulti FaceAnalyser)
-target_link_libraries(FaceLandmarkVidMulti dlib)
 target_link_libraries(FaceLandmarkVidMulti GazeAnalyser)
 target_link_libraries(FaceLandmarkVidMulti Utilities)
 
 target_link_libraries(FaceLandmarkVidMulti ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
+target_link_libraries(FaceLandmarkVidMulti ${DLIB_LIBRARY})
 
 install (TARGETS FaceLandmarkVidMulti DESTINATION bin)

exe/FeatureExtraction/CMakeLists.txt

@@ -22,5 +22,6 @@ target_link_libraries(FeatureExtraction Utilities)
 target_link_libraries(FeatureExtraction dlib)
 
 target_link_libraries(FeatureExtraction ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
+target_link_libraries(FeatureExtraction ${DLIB_LIBRARY})
 
 install (TARGETS FeatureExtraction DESTINATION bin)

lib/3rdParty/dlib/CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+
+
+
+#############################################################################
+#                                                                           #
+#  READ examples/CMakeLists.txt TO SEE HOW TO USE DLIB FROM C++ WITH CMAKE  #
+#                                                                           #
+#############################################################################
+
+
+
+
+
+get_directory_property(has_parent PARENT_DIRECTORY)
+if(NOT has_parent)
+   # When you call add_subdirectory(dlib) from a parent CMake project dlib's
+   # CMake scripts will assume you want to statically compile dlib into
+   # whatever you are building rather than create a standalone copy of dlib.
+   # This means CMake will build dlib as a static library, disable dlib's
+   # install targets so they don't clutter your project, and adjust a few other
+   # minor things that are convenient when statically building dlib as part of
+   # your own projects.
+   #
+   # On the other hand, if there is no parent CMake project or if
+   # DLIB_IN_PROJECT_BUILD is set to false, CMake will compile dlib as a normal
+   # standalone library (either shared or static, based on the state of CMake's
+   # BUILD_SHARED_LIBS flag), and include the usual install targets so you can
+   # install dlib on your computer via `make install`.  Since the only reason
+   # to build this CMakeLists.txt (the one you are reading right now) by itself
+   # is if you want to install dlib, we indicate as such by setting
+   # DLIB_IN_PROJECT_BUILD to false.
+   set(DLIB_IN_PROJECT_BUILD false)
+endif()
+add_subdirectory(dlib)

lib/3rdParty/dlib/MANIFEST.in

@@ -0,0 +1,15 @@
+#
+# MANIFEST.in
+#
+# Manifest template for creating the dlib source distribution.
+
+include MANIFEST.in
+include setup.py
+include README.md
+
+# sources
+recursive-include dlib **
+recursive-include python_examples *.txt *.py 
+recursive-include tools/python **
+
+

lib/3rdParty/dlib/README.md

@@ -0,0 +1,65 @@
+# dlib C++ library [![Travis Status](https://travis-ci.org/davisking/dlib.svg?branch=master)](https://travis-ci.org/davisking/dlib)
+
+Dlib is a modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ to solve real world problems. See [http://dlib.net](http://dlib.net) for the main project documentation and API reference.
+
+
+
+## Compiling dlib C++ example programs
+
+Go into the examples folder and type:
+
+```bash
+mkdir build; cd build; cmake .. ; cmake --build .
+```
+
+That will build all the examples.
+If you have a CPU that supports AVX instructions then turn them on like this:
+
+```bash
+mkdir build; cd build; cmake .. -DUSE_AVX_INSTRUCTIONS=1; cmake --build .
+```
+
+Doing so will make some things run faster.
+
+Finally, Visual Studio users should usually do everything in 64bit mode.  By default Visual Studio is 32bit, both in its outputs and its own execution, so you have to explicitly tell it to use 64bits.  Since it's not the 1990s anymore you probably want to use 64bits.  Do that with a cmake invocation like this:
+```bash
+cmake .. -G "Visual Studio 14 2015 Win64" -T host=x64 
+```
+
+## Compiling your own C++ programs that use dlib
+
+The examples folder has a [CMake tutorial](https://github.com/davisking/dlib/blob/master/examples/CMakeLists.txt) that tells you what to do.  There are also additional instructions on the [dlib web site](http://dlib.net/compile.html).
+
+## Compiling dlib Python API
+
+Before you can run the Python example programs you must compile dlib. Type:
+
+```bash
+python setup.py install
+```
+
+
+## Running the unit test suite
+
+Type the following to compile and run the dlib unit test suite:
+
+```bash
+cd dlib/test
+mkdir build
+cd build
+cmake ..
+cmake --build . --config Release
+./dtest --runall
+```
+
+Note that on windows your compiler might put the test executable in a subfolder called `Release`. If that's the case then you have to go to that folder before running the test.
+
+This library is licensed under the Boost Software License, which can be found in [dlib/LICENSE.txt](https://github.com/davisking/dlib/blob/master/dlib/LICENSE.txt).  The long and short of the license is that you can use dlib however you like, even in closed source commercial software.
+
+## dlib sponsors
+
+This research is based in part upon work supported by the Office of the Director of National Intelligence (ODNI), Intelligence Advanced Research Projects Activity (IARPA) under contract number 2014-14071600010. The views and conclusions contained herein are those of the authors and should not be interpreted as necessarily representing the official policies or endorsements, either expressed or implied, of ODNI, IARPA, or the U.S. Government.
+
+Version: 19.13
+Date:    Sat May 26 07:59:21 EDT 2018
+Mercurial Revision ID: d3d9bb458df6