1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Fixed Intel C++ 17 build in VS2015

This commit is contained in:
Maksim Shabunin
2016-12-01 16:41:21 +03:00
committed by Alexander Alekhin
parent 3d8395cae9
commit ab260dafd2
2 changed files with 6 additions and 1 deletions
+5
View File
@@ -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})
+1 -1
View File
@@ -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()