dnn: build fixes

modules/dnn/src/layers/convolution_layer.cpp

@@ -60,12 +60,12 @@ BaseConvolutionLayerImpl::BaseConvolutionLayerImpl():
     inpGroupCn(0), outGroupCn(0),
     ksize(0), bias(false), tryUseOpenCL(false)
 {
-    #if HAVE_CBLAS
-        if (getBlasThreads() != cv::getThreadNum())
-        {
-            setBlasThreads(cv::getThreadNum());
-        }
-    #endif
+#ifdef HAVE_LAPACK
+    if (getBlasThreads() != cv::getThreadNum())
+    {
+        setBlasThreads(cv::getThreadNum());
+    }
+#endif
 }
 
 void BaseConvolutionLayerImpl::init()

modules/dnn/src/layers/elementwise_layers.hpp

@@ -46,9 +46,7 @@
 #include <cmath>
 #include <opencv2/dnn/all_layers.hpp>
 #include <opencv2/core/ocl.hpp>
-#ifdef HAVE_OPENCL
-#include "modules/dnn/opencl_kernels_dnn.hpp"
-#endif
+#include "opencl_kernels_dnn.hpp"
 
 namespace cv
 {

modules/dnn/src/layers/lrn_layer.cpp

@@ -42,7 +42,7 @@
 #include "../precomp.hpp"
 #include "layers_common.hpp"
 #include "lrn_layer.hpp"
-#include "modules/dnn/opencl_kernels_dnn.hpp"
+#include "opencl_kernels_dnn.hpp"
 #include <opencv2/imgproc.hpp>
 #include <opencv2/core/ocl.hpp>
 #include <opencv2/dnn/shape_utils.hpp>

modules/dnn/src/layers/softmax_layer.cpp

@@ -43,7 +43,7 @@
 #include "layers_common.hpp"
 #include "softmax_layer.hpp"
 #include <opencv2/core/ocl.hpp>
-#include "modules/dnn/opencl_kernels_dnn.hpp"
+#include "opencl_kernels_dnn.hpp"
 #include <algorithm>
 #include <stdlib.h>
 using std::max;