提交 599d64a4 编写于 作者: A Alexander Alekhin

core(parallel): fix JS build, fix OpenMP version dump

上级 20d5d1c4
......@@ -5,6 +5,7 @@
#ifndef OPENCV_CORE_PARALLEL_BACKEND_HPP
#define OPENCV_CORE_PARALLEL_BACKEND_HPP
#include "opencv2/core/cvdef.h"
#include <memory>
namespace cv { namespace parallel {
......
......@@ -8,5 +8,5 @@ include("${OpenCV_SOURCE_DIR}/cmake/OpenCVPluginStandalone.cmake")
set(WITH_OPENMP ON)
include("${OpenCV_SOURCE_DIR}/modules/core/cmake/parallel/init.cmake")
message(STATUS "OpenMP: ${OPENMP_VERSION}")
message(STATUS "OpenMP: ${OpenMP_CXX_VERSION}")
ocv_create_plugin(core "opencv_core_parallel_openmp" "ocv.3rdparty.openmp" "OPENMP" "src/parallel/parallel_openmp.cpp")
......@@ -279,6 +279,7 @@ std::shared_ptr<IParallelBackendFactory> createPluginParallelBackendFactory(cons
#if OPENCV_HAVE_FILESYSTEM_SUPPORT && defined(PARALLEL_ENABLE_PLUGINS)
return std::make_shared<impl::PluginParallelBackendFactory>(baseName);
#else
CV_UNUSED(baseName);
return std::shared_ptr<IParallelBackendFactory>();
#endif
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册