Adapting Cmake to new interface.
This commit is contained in:
parent
cb309b10d3
commit
00bd196197
6 changed files with 42 additions and 1 deletions
|
@ -13,7 +13,7 @@ find_package( BLAS REQUIRED )
|
||||||
include_directories( ${BLAS_INCLUDE_DIRS} )
|
include_directories( ${BLAS_INCLUDE_DIRS} )
|
||||||
LINK_DIRECTORIES(${BLAS_LIBRARY_DIRS})
|
LINK_DIRECTORIES(${BLAS_LIBRARY_DIRS})
|
||||||
|
|
||||||
find_package( OpenCV REQUIRED )
|
find_package( OpenCV 3.1 REQUIRED )
|
||||||
|
|
||||||
MESSAGE("OpenCV information:")
|
MESSAGE("OpenCV information:")
|
||||||
MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}")
|
MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}")
|
||||||
|
@ -191,6 +191,8 @@ add_subdirectory(lib/local/LandmarkDetector)
|
||||||
add_subdirectory(lib/local/FaceAnalyser)
|
add_subdirectory(lib/local/FaceAnalyser)
|
||||||
# Gaze library
|
# Gaze library
|
||||||
add_subdirectory(lib/local/GazeAnalyser)
|
add_subdirectory(lib/local/GazeAnalyser)
|
||||||
|
# Utilities library
|
||||||
|
add_subdirectory(lib/local/Utilities)
|
||||||
# executables
|
# executables
|
||||||
add_subdirectory(exe/FaceLandmarkImg)
|
add_subdirectory(exe/FaceLandmarkImg)
|
||||||
add_subdirectory(exe/FaceLandmarkVid)
|
add_subdirectory(exe/FaceLandmarkVid)
|
||||||
|
|
|
@ -7,11 +7,13 @@ include_directories(${LandmarkDetector_SOURCE_DIR}/include)
|
||||||
include_directories(../../lib/local/LandmarkDetector/include)
|
include_directories(../../lib/local/LandmarkDetector/include)
|
||||||
include_directories(../../lib/local/FaceAnalyser/include)
|
include_directories(../../lib/local/FaceAnalyser/include)
|
||||||
include_directories(../../lib/local/GazeAnalyser/include)
|
include_directories(../../lib/local/GazeAnalyser/include)
|
||||||
|
include_directories(../../lib/local/Utilities/include)
|
||||||
|
|
||||||
add_executable(FaceLandmarkImg FaceLandmarkImg.cpp)
|
add_executable(FaceLandmarkImg FaceLandmarkImg.cpp)
|
||||||
target_link_libraries(FaceLandmarkImg LandmarkDetector)
|
target_link_libraries(FaceLandmarkImg LandmarkDetector)
|
||||||
target_link_libraries(FaceLandmarkImg FaceAnalyser)
|
target_link_libraries(FaceLandmarkImg FaceAnalyser)
|
||||||
target_link_libraries(FaceLandmarkImg GazeAnalyser)
|
target_link_libraries(FaceLandmarkImg GazeAnalyser)
|
||||||
|
target_link_libraries(FaceLandmarkImg Utilities)
|
||||||
target_link_libraries(FaceLandmarkImg dlib)
|
target_link_libraries(FaceLandmarkImg dlib)
|
||||||
|
|
||||||
target_link_libraries(FaceLandmarkImg ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
|
target_link_libraries(FaceLandmarkImg ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
|
||||||
|
|
|
@ -9,10 +9,12 @@ include_directories(${LandmarkDetector_SOURCE_DIR}/include)
|
||||||
include_directories(../../lib/local/LandmarkDetector/include)
|
include_directories(../../lib/local/LandmarkDetector/include)
|
||||||
include_directories(../../lib/local/FaceAnalyser/include)
|
include_directories(../../lib/local/FaceAnalyser/include)
|
||||||
include_directories(../../lib/local/GazeAnalyser/include)
|
include_directories(../../lib/local/GazeAnalyser/include)
|
||||||
|
include_directories(../../lib/local/Utilities/include)
|
||||||
|
|
||||||
target_link_libraries(FaceLandmarkVid LandmarkDetector)
|
target_link_libraries(FaceLandmarkVid LandmarkDetector)
|
||||||
target_link_libraries(FaceLandmarkVid FaceAnalyser)
|
target_link_libraries(FaceLandmarkVid FaceAnalyser)
|
||||||
target_link_libraries(FaceLandmarkVid GazeAnalyser)
|
target_link_libraries(FaceLandmarkVid GazeAnalyser)
|
||||||
|
target_link_libraries(FaceLandmarkVid Utilities)
|
||||||
|
|
||||||
target_link_libraries(FaceLandmarkVid dlib)
|
target_link_libraries(FaceLandmarkVid dlib)
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,11 @@ include_directories(${TBB_ROOT_DIR}/include)
|
||||||
include_directories(${LandmarkDetector_SOURCE_DIR}/include)
|
include_directories(${LandmarkDetector_SOURCE_DIR}/include)
|
||||||
|
|
||||||
include_directories(../../lib/local/LandmarkDetector/include)
|
include_directories(../../lib/local/LandmarkDetector/include)
|
||||||
|
include_directories(../../lib/local/Utilities/include)
|
||||||
|
|
||||||
add_executable(FaceLandmarkVidMulti FaceLandmarkVidMulti.cpp)
|
add_executable(FaceLandmarkVidMulti FaceLandmarkVidMulti.cpp)
|
||||||
target_link_libraries(FaceLandmarkVidMulti LandmarkDetector)
|
target_link_libraries(FaceLandmarkVidMulti LandmarkDetector)
|
||||||
|
target_link_libraries(FaceLandmarkVidMulti Utilities)
|
||||||
target_link_libraries(FaceLandmarkVidMulti dlib)
|
target_link_libraries(FaceLandmarkVidMulti dlib)
|
||||||
|
|
||||||
target_link_libraries(FaceLandmarkVidMulti ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
|
target_link_libraries(FaceLandmarkVidMulti ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
|
||||||
|
|
|
@ -9,10 +9,12 @@ include_directories(${LandmarkDetector_SOURCE_DIR}/include)
|
||||||
include_directories(../../lib/local/LandmarkDetector/include)
|
include_directories(../../lib/local/LandmarkDetector/include)
|
||||||
include_directories(../../lib/local/FaceAnalyser/include)
|
include_directories(../../lib/local/FaceAnalyser/include)
|
||||||
include_directories(../../lib/local/GazeAnalyser/include)
|
include_directories(../../lib/local/GazeAnalyser/include)
|
||||||
|
include_directories(../../lib/local/Utilities/include)
|
||||||
|
|
||||||
target_link_libraries(FeatureExtraction LandmarkDetector)
|
target_link_libraries(FeatureExtraction LandmarkDetector)
|
||||||
target_link_libraries(FeatureExtraction FaceAnalyser)
|
target_link_libraries(FeatureExtraction FaceAnalyser)
|
||||||
target_link_libraries(FeatureExtraction GazeAnalyser)
|
target_link_libraries(FeatureExtraction GazeAnalyser)
|
||||||
|
target_link_libraries(FeatureExtraction Utilities)
|
||||||
target_link_libraries(FeatureExtraction dlib)
|
target_link_libraries(FeatureExtraction dlib)
|
||||||
|
|
||||||
target_link_libraries(FeatureExtraction ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
|
target_link_libraries(FeatureExtraction ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
|
||||||
|
|
31
lib/local/Utilities/CMakeLists.txt
Normal file
31
lib/local/Utilities/CMakeLists.txt
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
include_directories(${BOOST_INCLUDE_DIR})
|
||||||
|
|
||||||
|
SET(SOURCE
|
||||||
|
src/ImageCapture.cpp
|
||||||
|
src/RecorderCSV.cpp
|
||||||
|
src/RecorderHOG.cpp
|
||||||
|
src/RecorderOpenFace.cpp
|
||||||
|
src/RecorderOpenFaceParameters.cpp
|
||||||
|
src/SequenceCapture.cpp
|
||||||
|
src/VisualizationUtils.cpp
|
||||||
|
src/Visualizer.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
SET(HEADERS
|
||||||
|
include/ImageCapture.h
|
||||||
|
include/RecorderCSV.h
|
||||||
|
include/RecorderHOG.h
|
||||||
|
include/RecorderOpenFace.h
|
||||||
|
include/RecorderOpenFaceParameters.h
|
||||||
|
include/SequenceCapture.h
|
||||||
|
include/VisualizationUtils.h
|
||||||
|
include/Visualizer.h
|
||||||
|
)
|
||||||
|
|
||||||
|
include_directories(./include)
|
||||||
|
include_directories(${UTILITIES_SOURCE_DIR}/include)
|
||||||
|
|
||||||
|
add_library( Utilities ${SOURCE} ${HEADERS})
|
||||||
|
|
||||||
|
install (TARGETS Utilities DESTINATION lib)
|
||||||
|
install (FILES ${HEADERS} DESTINATION include/OpenFace)
|
Loading…
Reference in a new issue