From e37a58df3cad723b50eeb3d64b719db4d9868574 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon, 14 Dec 2015 13:34:30 +0300
Subject: [PATCH 1/2] include "cvconfig.h"

---
 modules/hal/src/precomp.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hal/src/precomp.hpp b/modules/hal/src/precomp.hpp
index 16586368e..7d310f4aa 100644
--- a/modules/hal/src/precomp.hpp
+++ b/modules/hal/src/precomp.hpp
@@ -40,6 +40,7 @@
 //
 //M*/
 
+#include "cvconfig.h"
 #include "opencv2/hal.hpp"
 #include "opencv2/hal/intrin.hpp"
 #include <algorithm>

From 5d346128f71fa985484040c2bd703488584731f8 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon, 14 Dec 2015 13:52:02 +0300
Subject: [PATCH 2/2] workaround: cvconfig.h doesn't work with hal at this
 moment

---
 cmake/cl2cpp.cmake          | 1 +
 modules/hal/src/precomp.hpp | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/cl2cpp.cmake b/cmake/cl2cpp.cmake
index d5e3d5f03..ed5dcb876 100644
--- a/cmake/cl2cpp.cmake
+++ b/cmake/cl2cpp.cmake
@@ -24,6 +24,7 @@ endif()
 set(STR_CPP "// This file is auto-generated. Do not edit!
 
 #include \"precomp.hpp\"
+#include \"cvconfig.h\"
 #include \"${OUTPUT_HPP_NAME}\"
 
 #ifdef HAVE_OPENCL
diff --git a/modules/hal/src/precomp.hpp b/modules/hal/src/precomp.hpp
index 7d310f4aa..16586368e 100644
--- a/modules/hal/src/precomp.hpp
+++ b/modules/hal/src/precomp.hpp
@@ -40,7 +40,6 @@
 //
 //M*/
 
-#include "cvconfig.h"
 #include "opencv2/hal.hpp"
 #include "opencv2/hal/intrin.hpp"
 #include <algorithm>