r/sustaining_gazes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/Windows-GUI

Browse source
This commit is contained in:
Tadas Baltrusaitis 2017-10-24 16:28:31 +01:00
commit 7c98f6f378
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -9,6 +9,10 @@ set(CMAKE_CONFIG_DIR etc/OpenFace)
set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_CONFIG_DIR}") set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_CONFIG_DIR}")
add_definitions(-DCONFIG_DIR="${CONFIG_DIR}") add_definitions(-DCONFIG_DIR="${CONFIG_DIR}")
find_package( BLAS REQUIRED )
include_directories( ${BLAS_INCLUDE_DIRS} )
LINK_DIRECTORIES(${BLAS_LIBRARY_DIRS})
find_package( OpenCV REQUIRED ) find_package( OpenCV REQUIRED )
MESSAGE("OpenCV information:") MESSAGE("OpenCV information:")
@ -79,6 +83,18 @@ foreach(file ${files})
install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model/patch_experts) install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model/patch_experts)
endforeach() endforeach()
file(GLOB files "lib/local/LandmarkDetector/model/patch_experts/*.dat")
foreach(file ${files})
if (MSVC)
file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/Debug/model/patch_experts)
file(COPY ${file} DESTINATION ${CMAKE_BINARY_DIR}/bin/Release/model/patch_experts)
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") file(GLOB files "lib/local/LandmarkDetector/model/pdms/*.txt")
foreach(file ${files}) foreach(file ${files})
if (MSVC) if (MSVC)

7
lib/local/FaceAnalyser/CMakeLists.txt
View file

@ -6,6 +6,9 @@ include_directories(${BOOST_INCLUDE_DIR})
SET(SOURCE SET(SOURCE
src/Face_utils.cpp src/Face_utils.cpp
src/FaceAnalyser.cpp src/FaceAnalyser.cpp
src/FaceAnalyserParameters.cpp
src/PAW.cpp
src/PDM.cpp
src/SVM_dynamic_lin.cpp src/SVM_dynamic_lin.cpp
src/SVM_static_lin.cpp src/SVM_static_lin.cpp
src/SVR_dynamic_lin_regressors.cpp src/SVR_dynamic_lin_regressors.cpp
@ -16,6 +19,9 @@ SET(SOURCE
SET(HEADERS SET(HEADERS
include/Face_utils.h include/Face_utils.h
include/FaceAnalyser.h include/FaceAnalyser.h
include/FaceAnalyserParameters.h
include/PAW.h
include/PDM.h
include/SVM_dynamic_lin.h include/SVM_dynamic_lin.h
include/SVM_static_lin.h include/SVM_static_lin.h
include/SVR_dynamic_lin_regressors.h include/SVR_dynamic_lin_regressors.h
@ -25,7 +31,6 @@ SET(HEADERS
include_directories(./include) include_directories(./include)
include_directories(${FACEANALYSER_SOURCE_DIR}/include) include_directories(${FACEANALYSER_SOURCE_DIR}/include)
include_directories(../LandmarkDetector/include)
add_library( FaceAnalyser ${SOURCE} ${HEADERS}) add_library( FaceAnalyser ${SOURCE} ${HEADERS})