Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
817a17b2
Commit
817a17b2
authored
Dec 01, 2016
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7767 from mshabunin:icl-support
parents
5985d716
19959cbf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
CMakeLists.txt
3rdparty/openexr/CMakeLists.txt
+5
-0
OpenCVDetectCXXCompiler.cmake
cmake/OpenCVDetectCXXCompiler.cmake
+1
-1
No files found.
3rdparty/openexr/CMakeLists.txt
View file @
817a17b2
...
...
@@ -52,6 +52,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
}
)
...
...
cmake/OpenCVDetectCXXCompiler.cmake
View file @
817a17b2
...
...
@@ -41,7 +41,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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment