From b3fba320fcd3dced1f9252637eff016a89b23482 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Tue, 11 Feb 2014 17:03:24 -0800
Subject: [PATCH] We need the dependencies, too.

---
 cmake/modules/FindVisage.cmake       | 32 ++++++++++++++++++++++++----
 interface/external/visage/readme.txt |  2 +-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/FindVisage.cmake b/cmake/modules/FindVisage.cmake
index a8d1acc30b..600164908c 100644
--- a/cmake/modules/FindVisage.cmake
+++ b/cmake/modules/FindVisage.cmake
@@ -16,12 +16,36 @@ if (VISAGE_LIBRARIES AND VISAGE_INCLUDE_DIRS)
   # in cache already
   set(VISAGE_FOUND TRUE)
 else (VISAGE_LIBRARIES AND VISAGE_INCLUDE_DIRS)
-  find_path(VISAGE_INCLUDE_DIRS VisageTracker2.h ${VISAGE_ROOT_DIR}/include)
-
+  find_path(VISAGE_INCLUDE_DIR VisageTracker2.h ${VISAGE_ROOT_DIR}/include)
+  
   if (APPLE)
-    find_library(VISAGE_LIBRARIES libvscore.a ${VISAGE_ROOT_DIR}/lib)
+    find_path(VISAGE_OPENCV_INCLUDE_DIR cv.h ${VISAGE_ROOT_DIR}/dependencies/OpenCV_MacOSX/include)
+    if (VISAGE_INCLUDE_DIR AND VISAGE_OPENCV_INCLUDE_DIR)
+      set(VISAGE_INCLUDE_DIRS "${VISAGE_INCLUDE_DIR};${VISAGE_OPENCV_INCLUDE_DIR}" CACHE INTERNAL "Visage include dirs")
+    endif (VISAGE_INCLUDE_DIR AND VISAGE_OPENCV_INCLUDE_DIR)
+    
+    find_library(VISAGE_CORE_LIBRARY libvscore.a ${VISAGE_ROOT_DIR}/lib)
+    find_library(VISAGE_VISION_LIBRARY libvsvision.a ${VISAGE_ROOT_DIR}/lib)
+    find_library(VISAGE_OPENCV_LIBRARY libOpenCV.a ${VISAGE_ROOT_DIR}/dependencies/OpenCV_MacOSX/lib)
+    if (VISAGE_CORE_LIBRARY AND VISAGE_VISION_LIBRARY AND VISAGE_OPENCV_LIBRARY)
+      set(VISAGE_LIBRARIES "${VISAGE_CORE_LIBRARY};${VISAGE_VISION_LIBRARY};${VISAGE_OPENCV_LIBRARY}"
+        CACHE INTERNAL "Visage libraries")
+    endif (VISAGE_CORE_LIBRARY AND VISAGE_VISION_LIBRARY AND VISAGE_OPENCV_LIBRARY)
+    
   elseif (WIN32)
-    find_library(VISAGE_LIBRARIES vscore.dll ${VISAGE_ROOT_DIR}/lib)
+    find_path(VISAGE_OPENCV_INCLUDE_DIR cv.h ${VISAGE_ROOT_DIR}/dependencies/OpenCV_Win32/include)
+    if (VISAGE_INCLUDE_DIR AND VISAGE_OPENCV_INCLUDE_DIR)
+      set(VISAGE_INCLUDE_DIRS "${VISAGE_INCLUDE_DIR};${VISAGE_OPENCV_INCLUDE_DIR}" CACHE INTERNAL "Visage include dirs")
+    endif (VISAGE_INCLUDE_DIR AND VISAGE_OPENCV_INCLUDE_DIR)
+    
+    find_library(VISAGE_CORE_LIBRARY vscore.lib ${VISAGE_ROOT_DIR}/lib)
+    find_library(VISAGE_VISION_LIBRARY vsvision.lib ${VISAGE_ROOT_DIR}/lib)
+    find_library(VISAGE_OPENCV_LIBRARY OpenCV.lib ${VISAGE_ROOT_DIR}/dependencies/OpenCV_Win32/lib)
+    if (VISAGE_CORE_LIBRARY AND VISAGE_VISION_LIBRARY AND VISAGE_OPENCV_LIBRARY)
+      set(VISAGE_LIBRARIES "${VISAGE_CORE_LIBRARY};${VISAGE_VISION_LIBRARY};${VISAGE_OPENCV_LIBRARY}"
+        CACHE INTERNAL "Visage libraries")
+    endif (VISAGE_CORE_LIBRARY AND VISAGE_VISION_LIBRARY AND VISAGE_OPENCV_LIBRARY)
+    
   endif ()
 
   if (VISAGE_INCLUDE_DIRS AND VISAGE_LIBRARIES)
diff --git a/interface/external/visage/readme.txt b/interface/external/visage/readme.txt
index dfb3da3969..8aa28f81c4 100644
--- a/interface/external/visage/readme.txt
+++ b/interface/external/visage/readme.txt
@@ -2,7 +2,7 @@
 Instructions for adding the Visage driver to Interface
 Andrzej Kapolka, February 11, 2014
 
-1. Copy the Visage sdk folders (lib, include) into the interface/external/visage folder.
+1. Copy the Visage sdk folders (lib, include, dependencies) into the interface/external/visage folder.
    This readme.txt should be there as well.
 
 2. Copy the Visage configuration data folder (visageSDK-MacOS/Samples/MacOSX/data/) to interface/resources/visage