mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin 2021-02-21 21:22:29 +00:00
parent 20d5d1c4c2
commit 599d64a405
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/parallel/parallel_backend.hpp
View File

@ -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 {

2
modules/core/misc/plugins/parallel_openmp/CMakeLists.txt
View File

@ -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")

1
modules/core/src/parallel/plugin_parallel_wrapper.impl.hpp
View File

@ -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
}