From ab260dafd22c54221c925c64f5cc168f9906f1fe Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Thu, 1 Dec 2016 16:41:21 +0300 Subject: [PATCH] Fixed Intel C++ 17 build in VS2015 --- 3rdparty/openexr/CMakeLists.txt | 5 +++++ cmake/OpenCVDetectCXXCompiler.cmake | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt index dddf3738c4..194d46f28a 100644 --- a/3rdparty/openexr/CMakeLists.txt +++ b/3rdparty/openexr/CMakeLists.txt @@ -49,6 +49,11 @@ if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") endif() +if(MSVC AND CV_ICC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qrestrict") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qrestrict") +endif() + add_library(IlmImf STATIC ${lib_hdrs} ${lib_srcs}) target_link_libraries(IlmImf ${ZLIB_LIBRARIES}) diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index b53f8d7363..a2c427c9ed 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -38,7 +38,7 @@ if(UNIX) endif() endif() -if(MSVC AND CMAKE_C_COMPILER MATCHES "icc") +if(MSVC AND CMAKE_C_COMPILER MATCHES "icc|icl") set(CV_ICC __INTEL_COMPILER_FOR_WINDOWS) endif()