From a56c12278ee130ef59d86dcd284e37d406b70004 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 15 Apr 2019 20:00:55 +0300 Subject: [PATCH] cmake: fix C++11 flags (ENABLE_CXX11 is not required) --- cmake/OpenCVDetectCXXCompiler.cmake | 2 +- cmake/OpenCVDetectInferenceEngine.cmake | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index 03afccd935..0c79f42f39 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -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") diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index 5a4ddc6470..a5c2b5d948 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -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()