generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sergiud_vs2012rtm_support'

Browse Source
This commit is contained in:
Andrey Kamaev 2012-08-19 17:49:54 +04:00
commit 7d2b7b801a
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -336,6 +336,7 @@ include(cmake/OpenCVCompilerOptions.cmake REQUIRED)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if(MSVC) if(MSVC)
include(cmake/OpenCVCRTLinkage.cmake REQUIRED) include(cmake/OpenCVCRTLinkage.cmake REQUIRED)
add_definitions(-D_VARIADIC_MAX=10)
endif(MSVC) endif(MSVC)

1
modules/calib3d/test/test_affine3d_estimator.cpp
View File

@ -48,6 +48,7 @@ using namespace std;
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <functional>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include <numeric> #include <numeric>

1
modules/calib3d/test/test_chesscorners.cpp
View File

@ -42,6 +42,7 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include "test_chessboardgenerator.hpp" #include "test_chessboardgenerator.hpp"
#include <functional>
#include <limits> #include <limits>
#include <numeric> #include <numeric>

1
modules/gpu/test/precomp.hpp
View File

@ -51,6 +51,7 @@
#include <cstdio> #include <cstdio>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <functional>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <limits> #include <limits>