diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d53bc6..9e91c42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,10 @@ set(CMAKE_CONFIG_DIR etc/OpenFace) set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_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 ) MESSAGE("OpenCV information:") @@ -79,6 +83,18 @@ foreach(file ${files}) install(FILES ${file} DESTINATION ${CMAKE_CONFIG_DIR}/model/patch_experts) 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") foreach(file ${files}) if (MSVC) diff --git a/lib/local/FaceAnalyser/CMakeLists.txt b/lib/local/FaceAnalyser/CMakeLists.txt index 1652e9a..1cab4e4 100644 --- a/lib/local/FaceAnalyser/CMakeLists.txt +++ b/lib/local/FaceAnalyser/CMakeLists.txt @@ -6,6 +6,9 @@ include_directories(${BOOST_INCLUDE_DIR}) SET(SOURCE src/Face_utils.cpp src/FaceAnalyser.cpp + src/FaceAnalyserParameters.cpp + src/PAW.cpp + src/PDM.cpp src/SVM_dynamic_lin.cpp src/SVM_static_lin.cpp src/SVR_dynamic_lin_regressors.cpp @@ -16,6 +19,9 @@ SET(SOURCE SET(HEADERS include/Face_utils.h include/FaceAnalyser.h + include/FaceAnalyserParameters.h + include/PAW.h + include/PDM.h include/SVM_dynamic_lin.h include/SVM_static_lin.h include/SVR_dynamic_lin_regressors.h @@ -25,7 +31,6 @@ SET(HEADERS include_directories(./include) include_directories(${FACEANALYSER_SOURCE_DIR}/include) -include_directories(../LandmarkDetector/include) add_library( FaceAnalyser ${SOURCE} ${HEADERS})