Merge pull request #7808 from alalek:backport_7767

29f5294f · Maksim Shabunin · cf97e6e0 · ab260daf · 29f5294f · 29f5294f
Commit 29f5294f authored Dec 07, 2016 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CMakeLists.txt 3rdparty/openexr/CMakeLists.txt +5 -0

OpenCVDetectCXXCompiler.cmake cmake/OpenCVDetectCXXCompiler.cmake +1 -1

No files found.
--- 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})


--- 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()