Fix the make install process on Unix

Conflicts:
	.gitignore

.gitignore

@@ -34,3 +34,4 @@ matlab_runners/Action Unit Experiments/out_DISFA/
 matlab_runners/Action Unit Experiments/out_fera/
 matlab_runners/Demos/output_features_seq/
 matlab_runners/Demos/output_features_vid/
+lib/local/LandmarkDetector/include/PathConfig.h

CMakeLists.txt

@@ -5,6 +5,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 
+set(CMAKE_CONFIG_DIR etc/OpenFace)
+
 find_package( OpenCV REQUIRED )
 MESSAGE("OpenCV information:") 
 MESSAGE("  OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}") 
@@ -33,6 +35,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/model)
 	endif(MSVC)
+
+	install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model)
 endforeach()
 
 # Move the hierarchical LandmarkDetector models
@@ -44,6 +48,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/model)
 	endif(MSVC)
+
+	install(DIRECTORY ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model)
 endforeach()
 
 file(GLOB files "lib/local/LandmarkDetector/model/detection_validation/*.txt")
@@ -54,6 +60,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/model/detection_validation)
 	endif(MSVC)
+
+	install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model/detection_validation)
 endforeach()
 
 file(GLOB files "lib/local/LandmarkDetector/model/patch_experts/*.txt")
@@ -64,6 +72,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/model/patch_experts)
 	endif(MSVC)
+
+	install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model/patch_experts)
 endforeach()
 
 file(GLOB files "lib/local/LandmarkDetector/model/pdms/*.txt")
@@ -74,6 +84,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/model/pdms)
 	endif(MSVC)
+
+	install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model/pdms)
 endforeach()
 
 # Move OpenCV classifiers
@@ -85,6 +97,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/classifiers)
 	endif(MSVC)
+
+	install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/classifiers)
 endforeach()
 
 # Move AU prediction modules
@@ -96,6 +110,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/AU_predictors)
 	endif(MSVC)
+
+	install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/AU_predictors)
 endforeach()
 
 # Move AU prediction modules
@@ -107,6 +123,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/AU_predictors)
 	endif(MSVC)
+
+	install(DIRECTORY ${file} DESTINATION ${CMAKE_CONFIG_DIR}/AU_predictors)
 endforeach()
 
 # Move AU prediction modules
@@ -118,6 +136,8 @@ foreach(file ${files})
 	else(MSVC)
 		file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/AU_predictors)
 	endif(MSVC)
+
+	install(DIRECTORY ${file} DESTINATION ${CMAKE_CONFIG_DIR}/AU_predictors)
 endforeach()
 
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")

lib/local/FaceAnalyser/CMakeLists.txt

@@ -29,5 +29,5 @@ include_directories(../LandmarkDetector/include)
 
 add_library( FaceAnalyser ${SOURCE} ${HEADERS})
 
-install (TARGETS FaceAnalyser DESTINATION bin)
+install (TARGETS FaceAnalyser DESTINATION lib)
-install (FILES ${HEADERS} DESTINATION include)
+install (FILES ${HEADERS} DESTINATION include/OpenFace)

lib/local/LandmarkDetector/CMakeLists.txt

@@ -3,6 +3,13 @@ include_directories(${TBB_ROOT_DIR}/include)
 
 include_directories(${BOOST_INCLUDE_DIR})
 
+set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_CONFIG_DIR}")
+configure_file(
+	${CMAKE_CURRENT_SOURCE_DIR}/include/PathConfig.h.in
+	${CMAKE_CURRENT_SOURCE_DIR}/include/PathConfig.h
+	NEWLINE_STYLE WIN32
+)
+
 SET(SOURCE
     src/CCNF_patch_expert.cpp
 	src/LandmarkDetectionValidator.cpp
@@ -32,10 +39,14 @@ SET(HEADERS
 	include/stdafx.h
 )
 
+SET(EXTRA_HEADERS
+	include/PathConfig.h
+)
+
 include_directories(./include)
 include_directories(${LandmarkDetector_SOURCE_DIR}/include)
 
-add_library( LandmarkDetector ${SOURCE} ${HEADERS})
+add_library( LandmarkDetector ${SOURCE} ${HEADERS} ${EXTRA_HEADERS})
 
-install (TARGETS LandmarkDetector DESTINATION bin)
+install (TARGETS LandmarkDetector DESTINATION lib)
-install (FILES ${HEADERS} DESTINATION include)
+install (FILES ${HEADERS} DESTINATION include/OpenFace)

lib/local/LandmarkDetector/include/PathConfig.h.in

@@ -0,0 +1,65 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge,
+// all rights reserved.
+//
+// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS
+// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY.
+// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Notwithstanding the license granted herein, Licensee acknowledges that certain components
+// of the Software may be covered by so-called “open source” software licenses (“Open Source
+// Components”), which means any software licenses approved as open source licenses by the
+// Open Source Initiative or any substantially similar licenses, including without limitation any
+// license that, as a condition of distribution of the software licensed under such license,
+// requires that the distributor make the software available in source code format. Licensor shall
+// provide a list of Open Source Components for a particular version of the Software upon
+// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to
+// the extent required by the licenses covering Open Source Components, the terms of such
+// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the
+// licenses applicable to Open Source Components prohibit any of the restrictions in this
+// License Agreement with respect to such Open Source Component, such restrictions will not
+// apply to such Open Source Component. To the extent the terms of the licenses applicable to
+// Open Source Components require Licensor to make an offer to provide source code or
+// related information in connection with the Software, such offer is hereby made. Any request
+// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk
+// Licensee acknowledges receipt of notices for the Open Source Components for the initial
+// delivery of the Software.
+
+//     * Any publications arising from the use of this software, including but
+//       not limited to academic journal and conference publications, technical
+//       reports and manuals, must cite at least one of the following works:
+//
+//       OpenFace: an open source facial behavior analysis toolkit
+//       Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency
+//       in IEEE Winter Conference on Applications of Computer Vision, 2016  
+//
+//       Rendering of Eyes for Eye-Shape Registration and Gaze Estimation
+//       Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling 
+//       in IEEE International. Conference on Computer Vision (ICCV),  2015 
+//
+//       Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection
+//       Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson 
+//       in Facial Expression Recognition and Analysis Challenge, 
+//       IEEE International Conference on Automatic Face and Gesture Recognition, 2015 
+//
+//       Constrained Local Neural Fields for robust facial landmark detection in the wild.
+//       Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. 
+//       in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013.    
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//  Path parameters for configuration loading
+#ifndef __PATH_CONFIG_H
+#define __PATH_CONFIG_H
+
+#define CONFIG_DIR "@CONFIG_DIR@"
+
+#endif // __PATH_CONFIG_H

lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp

@@ -59,6 +59,7 @@
 #include "stdafx.h"
 
 #include "LandmarkDetectorParameters.h"
+#include "PathConfig.h"
 
 // Boost includes
 #include <filesystem.hpp>
@@ -67,6 +68,7 @@
 // System includes
 #include <sstream>
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
@@ -200,17 +202,27 @@ FaceModelParameters::FaceModelParameters(vector<string> &arguments)
 	}
 
 	// Make sure model_location is valid
-	if (!boost::filesystem::exists(boost::filesystem::path(model_location)))
+	// First check working directory, then the executable's directory, then the config path set by the build process.
+	boost::filesystem::path config_path = boost::filesystem::path(CONFIG_DIR);
+	boost::filesystem::path model_path = boost::filesystem::path(model_location);
+	if (boost::filesystem::exists(model_path))
 	{
-		model_location = (root / model_location).string();
+		model_location = model_path.string();
-		if (!boost::filesystem::exists(boost::filesystem::path(model_location)))
+	}
+	else if (boost::filesystem::exists(root/model_path))
+	{
+		model_location = (root/model_path).string();
+	}
+	else if (boost::filesystem::exists(config_path/model_path))
+	{
+		model_location = (config_path/model_path).string();
+	}
+	else
 	{
 		std::cout << "Could not find the landmark detection model to load" << std::endl;
 	}
 }
 
-}
-
 void FaceModelParameters::init()
 {