From c334bf0ac37c0fb8c8422ff219102eabbcf164b5 Mon Sep 17 00:00:00 2001 From: Chris Watts Date: Thu, 29 Dec 2016 23:36:10 +0000 Subject: [PATCH] Use preprocessor defines rather than configured header files for CONFIG_DIR so it works when not using CMake --- .gitignore | 1 - CMakeLists.txt | 2 + lib/local/LandmarkDetector/CMakeLists.txt | 13 +--- .../LandmarkDetector/include/PathConfig.h.in | 65 ------------------- .../src/LandmarkDetectorParameters.cpp | 5 +- 5 files changed, 7 insertions(+), 79 deletions(-) delete mode 100644 lib/local/LandmarkDetector/include/PathConfig.h.in diff --git a/.gitignore b/.gitignore index a8771bb..e12c985 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,3 @@ 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 09b953a..cb4cfc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,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) +set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_CONFIG_DIR}") +add_definitions(-DCONFIG_DIR="${CONFIG_DIR}") find_package( OpenCV REQUIRED ) MESSAGE("OpenCV information:") diff --git a/lib/local/LandmarkDetector/CMakeLists.txt b/lib/local/LandmarkDetector/CMakeLists.txt index c795a5c..9d5055c 100644 --- a/lib/local/LandmarkDetector/CMakeLists.txt +++ b/lib/local/LandmarkDetector/CMakeLists.txt @@ -3,13 +3,6 @@ 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 @@ -39,14 +32,10 @@ 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} ${EXTRA_HEADERS}) +add_library( LandmarkDetector ${SOURCE} ${HEADERS} ) install (TARGETS LandmarkDetector DESTINATION lib) install (FILES ${HEADERS} DESTINATION include/OpenFace) diff --git a/lib/local/LandmarkDetector/include/PathConfig.h.in b/lib/local/LandmarkDetector/include/PathConfig.h.in deleted file mode 100644 index 6162820..0000000 --- a/lib/local/LandmarkDetector/include/PathConfig.h.in +++ /dev/null @@ -1,65 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// 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 diff --git a/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp b/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp index a2e9b67..90ac398 100644 --- a/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp +++ b/lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp @@ -59,7 +59,6 @@ #include "stdafx.h" #include "LandmarkDetectorParameters.h" -#include "PathConfig.h" // Boost includes #include @@ -70,6 +69,10 @@ #include #include +#ifndef CONFIG_DIR +#define CONFIG_DIR "~" +#endif + using namespace std; using namespace LandmarkDetector;