From 275ab53ebc361279a3119e051155d2c174a41be6 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Tue, 23 Oct 2012 15:12:39 +0400 Subject: [PATCH 1/2] Added default Eigen search path to support Eigen that comes with PCL --- cmake/OpenCVFindLibsPerf.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake index 4c12304687..6772c79b87 100644 --- a/cmake/OpenCVFindLibsPerf.cmake +++ b/cmake/OpenCVFindLibsPerf.cmake @@ -32,7 +32,7 @@ endif(WITH_CUDA) # --- Eigen --- if(WITH_EIGEN) find_path(EIGEN_INCLUDE_PATH "Eigen/Core" - PATHS /usr/local /opt /usr ENV ProgramFiles ENV ProgramW6432 + PATHS /usr/local /opt /usr $ENV{EIGEN_ROOT}/include ENV ProgramFiles ENV ProgramW6432 PATH_SUFFIXES include/eigen3 include/eigen2 Eigen/include/eigen3 Eigen/include/eigen2 DOC "The path to Eigen3/Eigen2 headers" CMAKE_FIND_ROOT_PATH_BOTH) From d681717702b0bf134b9b63032f11fe3ec08b304e Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Tue, 23 Oct 2012 15:13:46 +0400 Subject: [PATCH 2/2] warnings --- modules/core/src/parallel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp index 5a17c95a43..c31edede85 100644 --- a/modules/core/src/parallel.cpp +++ b/modules/core/src/parallel.cpp @@ -322,6 +322,7 @@ int cv::getNumThreads(void) void cv::setNumThreads( int threads ) { + (void)threads; #ifdef HAVE_PARALLEL_FRAMEWORK numThreads = threads; #endif