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

Merge pull request #14339 from alalek:cmake_fix_std_cxx11

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-16 13:10:24 +00:00
commit 7ad5d21900
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVDetectCXXCompiler.cmake
View File

@ -176,7 +176,7 @@ if(CMAKE_CXX11_COMPILE_FEATURES)
endif()
if(NOT HAVE_CXX11)
ocv_check_compiler_flag(CXX "" HAVE_CXX11 "${OpenCV_SOURCE_DIR}/cmake/checks/cxx11.cpp")
if(NOT HAVE_CXX11 AND ENABLE_CXX11)
if(NOT HAVE_CXX11)
ocv_check_compiler_flag(CXX "-std=c++11" HAVE_STD_CXX11 "${OpenCV_SOURCE_DIR}/cmake/checks/cxx11.cpp")
if(HAVE_STD_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

7
cmake/OpenCVDetectInferenceEngine.cmake
View File

@ -17,13 +17,6 @@
# INF_ENGINE_TARGET - set to name of imported library target representing InferenceEngine
#
if(NOT HAVE_CXX11)
message(WARNING "DL Inference engine requires C++11. You can turn it on via ENABLE_CXX11=ON CMake flag.")
return()
endif()
# =======================
function(add_custom_ie_build _inc _lib _lib_rel _lib_dbg _msg)
if(NOT _inc OR NOT (_lib OR _lib_rel OR _lib_dbg))
return()