merged all the latest changes from 2.4 to trunk
This commit is contained in:
11
modules/highgui/perf/perf_precomp.hpp
Normal file
11
modules/highgui/perf/perf_precomp.hpp
Normal file
@@ -0,0 +1,11 @@
|
||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||
#define __OPENCV_PERF_PRECOMP_HPP__
|
||||
|
||||
#include "opencv2/ts/ts.hpp"
|
||||
#include "opencv2/highgui/highgui.hpp"
|
||||
|
||||
#if GTEST_CREATE_SHARED_LIBRARY
|
||||
#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
|
||||
#endif
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user