Merge branch 'master' into OVMv2betacompatibility

68e740c1 · Max Lyon · b835f85f · 70c1f103 · 68e740c1 · 68e740c1
Commit 68e740c1 authored Jul 06, 2016 by Max Lyon
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

cmake/FindEIGEN3.cmake cmake/FindEIGEN3.cmake +1 -0

cmake/FindGMM.cmake cmake/FindGMM.cmake +1 -0

No files found.
--- a/cmake/FindEIGEN3.cmake
+++ b/cmake/FindEIGEN3.cmake
@@ -37,6 +37,7 @@ find_path( EIGEN3_INCLUDE_DIR
                 /usr/local/include
                 /usr/local/include/eigen3/
                 /opt/local/include/eigen3/
+                 "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.8"
                 "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.6"
                 "${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.6"
 		 "${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.6/include"                 

--- a/cmake/FindGMM.cmake
+++ b/cmake/FindGMM.cmake
@@ -27,6 +27,7 @@ find_path( GMM_INCLUDE_DIR
 		 "c:\\libs\\gmm-4.2\\include"
 		 "c:\\libs\\gmm-4.1\\include"
                 "c:\\libs\\gmm-3.0\\include"
+                 "${CMAKE_WINDOWS_LIBS_DIR}/general/gmm-5.0/include"
                 "${CMAKE_WINDOWS_LIBS_DIR}/general/gmm-4.2/include"
 		 ${PROJECT_SOURCE_DIR}/MacOS/Libs/gmm-3.1/include
                 ../../External/include