From b3e3bcbe1be67eaabec3b53e2f42d2c41ef23561 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Mon, 13 Jan 2014 20:12:31 -0800 Subject: [PATCH] adding more opencv libraries and fix cmake for opencv and faceshift for windows --- cmake/modules/FindFaceshift.cmake | 2 ++ cmake/modules/FindOpenCV.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/modules/FindFaceshift.cmake b/cmake/modules/FindFaceshift.cmake index 64151e6b1b..92eb5d5c0f 100644 --- a/cmake/modules/FindFaceshift.cmake +++ b/cmake/modules/FindFaceshift.cmake @@ -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) diff --git a/cmake/modules/FindOpenCV.cmake b/cmake/modules/FindOpenCV.cmake index 47b794bd75..d037f784b5 100644 --- a/cmake/modules/FindOpenCV.cmake +++ b/cmake/modules/FindOpenCV.cmake @@ -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)