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
a105f569
Commit
a105f569
authored
Oct 02, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15621 from alalek:cmake_ipp_licenses
parents
23bd1866
c92f3072
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
14 deletions
+23
-14
OpenCVFindIPPIW.cmake
cmake/OpenCVFindIPPIW.cmake
+23
-14
No files found.
cmake/OpenCVFindIPPIW.cmake
View file @
a105f569
...
...
@@ -29,6 +29,16 @@ macro(ippiw_debugmsg MESSAGE)
message
(
STATUS
"
${
MESSAGE
}
"
)
endif
()
endmacro
()
macro
(
ippiw_done
)
foreach
(
__file
${
IPP_IW_LICENSE_FILES
}
)
if
(
EXISTS
"
${
__file
}
"
)
ocv_install_3rdparty_licenses
(
ippiw
"
${
__file
}
"
)
endif
()
endforeach
()
return
()
endmacro
()
file
(
TO_CMAKE_PATH
"
${
IPPROOT
}
"
IPPROOT
)
# This function detects Intel IPP Integration Wrappers version by analyzing .h file
...
...
@@ -81,7 +91,7 @@ macro(ippiw_setup PATH BUILD)
if
(
EXISTS
"
${
FILE
}
"
)
set
(
HAVE_IPP_IW_LL 1
)
endif
()
return
()
ippiw_done
()
else
()
ippiw_debugmsg
(
"sources
\t
no"
)
endif
()
...
...
@@ -120,7 +130,7 @@ macro(ippiw_setup PATH BUILD)
if
(
EXISTS
"
${
FILE
}
"
)
set
(
HAVE_IPP_IW_LL 1
)
endif
()
return
()
ippiw_done
()
else
()
ippiw_debugmsg
(
"binaries
\t
no"
)
endif
()
...
...
@@ -147,14 +157,12 @@ if(BUILD_IPP_IW)
ippiw_setup
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/ippiw"
1
)
set
(
IPPIW_ROOT
"
${
IPPROOT
}
/../iw"
)
ocv_install_3rdparty_licenses
(
ippiw
"
${
IPPIW_ROOT
}
/../support.txt"
"
${
IPPIW_ROOT
}
/../third-party-programs.txt"
)
if
(
WIN32
)
ocv_install_3rdparty_licenses
(
ippiw
"
${
IPPIW_ROOT
}
/../EULA.rtf"
)
else
()
ocv_install_3rdparty_licenses
(
ippiw
"
${
IPPIW_ROOT
}
/../EULA.txt"
)
endif
()
set
(
IPP_IW_LICENSE_FILES
${
IPP_IW_LICENSE_FILES_EXTRA
}
"
${
IPPIW_ROOT
}
/../support.txt"
"
${
IPPIW_ROOT
}
/../third-party-programs.txt"
"
${
IPPIW_ROOT
}
/../EULA.rtf"
"
${
IPPIW_ROOT
}
/../EULA.txt"
)
# Package sources
get_filename_component
(
__PATH
"
${
IPPROOT
}
/../iw/"
ABSOLUTE
)
...
...
@@ -167,10 +175,11 @@ if(BUILD_IPP_IW)
include
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/ippicv/ippicv.cmake"
)
download_ippicv
(
TEMP_ROOT
)
set
(
IPPIW_ROOT
"
${
TEMP_ROOT
}
/iw/"
)
ocv_install_3rdparty_licenses
(
ippiw
"
${
IPPIW_ROOT
}
/../EULA.txt"
"
${
IPPIW_ROOT
}
/../support.txt"
"
${
IPPIW_ROOT
}
/../third-party-programs.txt"
)
set
(
IPP_IW_LICENSE_FILES
${
IPP_IW_LICENSE_FILES_EXTRA
}
"
${
IPPIW_ROOT
}
/../EULA.txt"
"
${
IPPIW_ROOT
}
/../support.txt"
"
${
IPPIW_ROOT
}
/../third-party-programs.txt"
)
ippiw_setup
(
"
${
IPPIW_ROOT
}
"
1
)
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