fixed compile problems when Makefiles are used

diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake
index a882ec2..a09acf7 100644 (file)
--- a/OpenCVModule.cmake
+++ b/OpenCVModule.cmake
@@ -106,10 +106,10 @@ macro(define_opencv_module name)
         add_executable(${the_target} ${test_srcs} ${test_hdrs})
 
         if(PCHSupport_FOUND)
-            set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test/precomp.hpp)
+            set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test/test_precomp.hpp)
             if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*")
                 if(${CMAKE_GENERATOR} MATCHES "Visual*")
-                    set(${the_target}_pch "test/precomp.cpp")
+                    set(${the_target}_pch "test/test_precomp.cpp")
                 endif()            
                 add_native_precompiled_header(${the_target} ${pch_header})
             elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")

diff --git a/modules/core/test/precomp.cpp b/modules/core/test/precomp.cpp
deleted file mode 100644 (file)
index c149df1..0000000
--- a/modules/core/test/precomp.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "precomp.hpp"

diff --git a/modules/core/test/test_arithm.cpp b/modules/core/test/test_arithm.cpp
index adcb862..c7b0252 100644 (file)
--- a/modules/core/test/test_arithm.cpp
+++ b/modules/core/test/test_arithm.cpp
@@ -1,4 +1,4 @@
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include <iostream>
 
 using namespace cv;

diff --git a/modules/core/test/test_main.cpp b/modules/core/test/test_main.cpp
index 033ea25..c2cc775 100644 (file)
--- a/modules/core/test/test_main.cpp
+++ b/modules/core/test/test_main.cpp
@@ -1,2 +1,2 @@
-#include "precomp.hpp"
+#include "test_precomp.hpp"
 #include "opencv2/gtest/gtest_main.hpp"

diff --git a/modules/core/test/test_precomp.cpp b/modules/core/test/test_precomp.cpp
new file mode 100644 (file)
index 0000000..5956e13
--- /dev/null
+++ b/modules/core/test/test_precomp.cpp
@@ -0,0 +1 @@
+#include "test_precomp.hpp"

diff --git a/modules/core/test/precomp.hpp b/modules/core/test/test_precomp.hpp
similarity index 100%
rename from modules/core/test/precomp.hpp
rename to modules/core/test/test_precomp.hpp