adding more opencv libraries and fix cmake for opencv and faceshift for windows

This commit is contained in:
Brad Hefta-Gaub 2014-01-13 20:12:31 -08:00
parent 73aae6ef02
commit b3e3bcbe1b
2 changed files with 4 additions and 0 deletions

View file

@ -22,6 +22,8 @@ else (FACESHIFT_LIBRARIES AND FACESHIFT_INCLUDE_DIRS)
find_library(FACESHIFT_LIBRARIES libfaceshift.a ${FACESHIFT_ROOT_DIR}/lib/MacOS/)
elseif (UNIX)
find_library(FACESHIFT_LIBRARIES libfaceshift.a ${FACESHIFT_ROOT_DIR}/lib/UNIX/)
elseif (WIN32)
find_library(FACESHIFT_LIBRARIES faceshift.lib ${FACESHIFT_ROOT_DIR}/lib/WIN32/)
endif ()
if (FACESHIFT_INCLUDE_DIRS AND FACESHIFT_LIBRARIES)

View file

@ -23,6 +23,8 @@ else (OPENCV_LIBRARIES AND OPENCV_INCLUDE_DIRS)
find_library(OPENCV_LIBRARY_${MODULE} libopencv_${MODULE}.a ${OPENCV_ROOT_DIR}/lib/MacOS/)
elseif (UNIX)
find_library(OPENCV_LIBRARY_${MODULE} libopencv_${MODULE}.a ${OPENCV_ROOT_DIR}/lib/UNIX/)
elseif (WIN32)
find_library(OPENCV_LIBRARY_${MODULE} opencv_${MODULE}.lib ${OPENCV_ROOT_DIR}/lib/Win32/)
endif ()
set(MODULE_LIBRARIES ${OPENCV_LIBRARY_${MODULE}} ${MODULE_LIBRARIES})
endforeach (MODULE)