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
49dd0305
Commit
49dd0305
authored
Mar 07, 2018
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10946 from mshabunin:add-license-install
parents
1393fd9e
7bbe002a
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
112 additions
and
2 deletions
+112
-2
CMakeLists.txt
3rdparty/cpufeatures/CMakeLists.txt
+2
-0
LICENSE.txt
3rdparty/include/opencl/LICENSE.txt
+25
-0
CMakeLists.txt
3rdparty/ittnotify/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/libjasper/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/libjpeg/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
+3
-1
CMakeLists.txt
3rdparty/libtiff/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/openexr/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/protobuf/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+2
-0
CMakeLists.txt
3rdparty/zlib/CMakeLists.txt
+2
-0
OpenCVDetectOpenCL.cmake
cmake/OpenCVDetectOpenCL.cmake
+1
-0
OpenCVFindIPP.cmake
cmake/OpenCVFindIPP.cmake
+1
-0
OpenCVFindIPPIW.cmake
cmake/OpenCVFindIPPIW.cmake
+14
-1
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+12
-0
COPYING.txt
modules/core/3rdparty/SoftFloat/COPYING.txt
+36
-0
CMakeLists.txt
modules/core/CMakeLists.txt
+2
-0
No files found.
3rdparty/cpufeatures/CMakeLists.txt
View file @
49dd0305
...
...
@@ -31,3 +31,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
OPENCV_CPUFEATURES_TARGET_NAME
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
cpufeatures LICENSE README.md
)
3rdparty/include/opencl/LICENSE.txt
0 → 100644
View file @
49dd0305
Copyright (c) 2008-2015 The Khronos Group Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.
MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
https://www.khronos.org/registry/
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
3rdparty/ittnotify/CMakeLists.txt
View file @
49dd0305
...
...
@@ -60,3 +60,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
ITT_LIBRARY
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
ittnotify src/ittnotify/LICENSE.BSD src/ittnotify/LICENSE.GPL
)
3rdparty/libjasper/CMakeLists.txt
View file @
49dd0305
...
...
@@ -47,3 +47,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
JASPER_LIBRARY
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
jasper LICENSE README copyright
)
3rdparty/libjpeg/CMakeLists.txt
View file @
49dd0305
...
...
@@ -51,3 +51,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
JPEG_LIBRARY
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
libjpeg README
)
3rdparty/libpng/CMakeLists.txt
View file @
49dd0305
...
...
@@ -48,7 +48,7 @@ if(PPC64LE OR PPC64)
list
(
APPEND lib_srcs powerpc/powerpc_init.c powerpc/filter_vsx_intrinsics.c
)
add_definitions
(
-DPNG_POWERPC_VSX_OPT=2
)
else
()
add_definitions
(
-DPNG_POWERPC_VSX_OPT=0
)
add_definitions
(
-DPNG_POWERPC_VSX_OPT=0
)
endif
()
endif
()
...
...
@@ -80,3 +80,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
PNG_LIBRARY
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
libpng LICENSE README opencv-libpng.patch
)
3rdparty/libtiff/CMakeLists.txt
View file @
49dd0305
...
...
@@ -470,3 +470,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
TIFF_LIBRARY
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
libtiff COPYRIGHT
)
3rdparty/openexr/CMakeLists.txt
View file @
49dd0305
...
...
@@ -76,5 +76,7 @@ if(NOT BUILD_SHARED_LIBS)
ocv_install_target
(
IlmImf EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
openexr LICENSE AUTHORS.ilmbase AUTHORS.openexr fix_msvc2013_errors.patch
)
set
(
OPENEXR_INCLUDE_PATHS
${
OPENEXR_INCLUDE_PATHS
}
PARENT_SCOPE
)
set
(
OPENEXR_VERSION
"1.7.1"
PARENT_SCOPE
)
3rdparty/protobuf/CMakeLists.txt
View file @
49dd0305
...
...
@@ -150,3 +150,5 @@ set(Protobuf_VERSION ${Protobuf_VERSION} CACHE INTERNAL "" FORCE)
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
libprotobuf EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
protobuf LICENSE README.md
)
3rdparty/tbb/CMakeLists.txt
View file @
49dd0305
...
...
@@ -156,4 +156,6 @@ ocv_install_target(tbb EXPORT OpenCVModules
ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
ocv_install_3rdparty_licenses
(
tbb
"
${
tbb_src_dir
}
/LICENSE"
"
${
tbb_src_dir
}
/README"
)
ocv_tbb_read_version
(
"
${
tbb_src_dir
}
/include"
)
3rdparty/zlib/CMakeLists.txt
View file @
49dd0305
...
...
@@ -99,3 +99,5 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
ocv_install_target
(
${
ZLIB_LIBRARY
}
EXPORT OpenCVModules ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT dev
)
endif
()
ocv_install_3rdparty_licenses
(
zlib README
)
cmake/OpenCVDetectOpenCL.cmake
View file @
49dd0305
...
...
@@ -5,6 +5,7 @@ if(APPLE)
else
(
APPLE
)
set
(
OPENCL_LIBRARY
""
CACHE STRING
"OpenCL library"
)
set
(
OPENCL_INCLUDE_DIR
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/include/opencl/1.2"
CACHE PATH
"OpenCL include directory"
)
ocv_install_3rdparty_licenses
(
opencl-headers
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/include/opencl/LICENSE.txt"
)
endif
(
APPLE
)
mark_as_advanced
(
OPENCL_INCLUDE_DIR OPENCL_LIBRARY
)
...
...
cmake/OpenCVFindIPP.cmake
View file @
49dd0305
...
...
@@ -244,6 +244,7 @@ if(NOT DEFINED IPPROOT)
if
(
NOT IPPROOT
)
return
()
endif
()
ocv_install_3rdparty_licenses
(
ippicv
"
${
IPPROOT
}
/readme.htm"
"
${
IPPROOT
}
/license/ippEULA.txt"
)
endif
()
file
(
TO_CMAKE_PATH
"
${
IPPROOT
}
"
__IPPROOT
)
...
...
cmake/OpenCVFindIPPIW.cmake
View file @
49dd0305
...
...
@@ -136,6 +136,13 @@ if(BUILD_IPP_IW)
# local sources
ippiw_setup
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/ippiw"
1
)
set
(
IPPIW_ROOT
"
${
IPPROOT
}
/../
${
IW_PACKAGE_SUBDIR
}
"
)
ocv_install_3rdparty_licenses
(
ippiw
"
${
IPPIW_ROOT
}
/EULA.txt"
"
${
IPPIW_ROOT
}
/redist.txt"
"
${
IPPIW_ROOT
}
/support.txt"
"
${
IPPIW_ROOT
}
/third-party-programs.txt"
)
# Package sources
get_filename_component
(
__PATH
"
${
IPPROOT
}
/../
${
IW_PACKAGE_SUBDIR
}
/"
ABSOLUTE
)
ippiw_setup
(
"
${
__PATH
}
"
1
)
...
...
@@ -161,9 +168,15 @@ if(NOT HAVE_IPP_ICV AND BUILD_IPP_IW)
set
(
TEMP_ROOT 0
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/ippicv/ippicv.cmake"
)
download_ippicv
(
TEMP_ROOT
)
set
(
IPPIW_ROOT
"
${
TEMP_ROOT
}
/../
${
IW_PACKAGE_SUBDIR
}
"
)
ocv_install_3rdparty_licenses
(
ippiw
"
${
IPPIW_ROOT
}
/EULA.txt"
"
${
IPPIW_ROOT
}
/redist.txt"
"
${
IPPIW_ROOT
}
/support.txt"
"
${
IPPIW_ROOT
}
/third-party-programs.txt"
)
# Package sources. Only sources are compatible with regular Intel IPP
ippiw_setup
(
"
${
TEMP_ROOT
}
/../
${
IW_PACKAGE_SUBDIR
}
/
"
1
)
ippiw_setup
(
"
${
IPPIW_ROOT
}
"
1
)
endif
()
...
...
cmake/OpenCVUtils.cmake
View file @
49dd0305
...
...
@@ -1002,6 +1002,18 @@ function(ocv_install_target)
endif
()
endfunction
()
# ocv_install_3rdparty_licenses(<library-name> <filename1> [<filename2> ..])
function
(
ocv_install_3rdparty_licenses library
)
foreach
(
filename
${
ARGN
}
)
get_filename_component
(
name
"
${
filename
}
"
NAME
)
install
(
FILES
"
${
filename
}
"
DESTINATION
"
${
OPENCV_OTHER_INSTALL_PATH
}
/licenses"
COMPONENT licenses
RENAME
"
${
library
}
-
${
name
}
"
OPTIONAL
)
endforeach
()
endfunction
()
# read set of version defines from the header file
macro
(
ocv_parse_header FILENAME FILE_VAR
)
...
...
modules/core/3rdparty/SoftFloat/COPYING.txt
0 → 100644
View file @
49dd0305
License for Berkeley SoftFloat Release 3c
John R. Hauser
2017 February 10
The following applies to the whole of SoftFloat Release 3c as well as to
each source file individually.
Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 The Regents of the
University of California. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions, and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions, and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
modules/core/CMakeLists.txt
View file @
49dd0305
...
...
@@ -70,3 +70,5 @@ endif()
ocv_add_accuracy_tests
()
ocv_add_perf_tests
()
ocv_install_3rdparty_licenses
(
SoftFloat
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/3rdparty/SoftFloat/COPYING.txt"
)
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