Skip to content

Commit 49dd030

Browse files
committed
Merge pull request opencv#10946 from mshabunin:add-license-install
2 parents 1393fd9 + 7bbe002 commit 49dd030

File tree

17 files changed

+112
-2
lines changed

17 files changed

+112
-2
lines changed

3rdparty/cpufeatures/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ endif()
3131
if(NOT BUILD_SHARED_LIBS)
3232
ocv_install_target(${OPENCV_CPUFEATURES_TARGET_NAME} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
3333
endif()
34+
35+
ocv_install_3rdparty_licenses(cpufeatures LICENSE README.md)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Copyright (c) 2008-2015 The Khronos Group Inc.
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a
4+
copy of this software and/or associated documentation files (the
5+
"Materials"), to deal in the Materials without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Materials, and to
8+
permit persons to whom the Materials are furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included
12+
in all copies or substantial portions of the Materials.
13+
14+
MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
15+
KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
16+
SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
17+
https://www.khronos.org/registry/
18+
19+
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
20+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
22+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
23+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25+
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

3rdparty/ittnotify/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,5 @@ endif()
6060
if(NOT BUILD_SHARED_LIBS)
6161
ocv_install_target(${ITT_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
6262
endif()
63+
64+
ocv_install_3rdparty_licenses(ittnotify src/ittnotify/LICENSE.BSD src/ittnotify/LICENSE.GPL)

3rdparty/libjasper/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ endif()
4747
if(NOT BUILD_SHARED_LIBS)
4848
ocv_install_target(${JASPER_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
4949
endif()
50+
51+
ocv_install_3rdparty_licenses(jasper LICENSE README copyright)

3rdparty/libjpeg/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ endif()
5151
if(NOT BUILD_SHARED_LIBS)
5252
ocv_install_target(${JPEG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
5353
endif()
54+
55+
ocv_install_3rdparty_licenses(libjpeg README)

3rdparty/libpng/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if(PPC64LE OR PPC64)
4848
list(APPEND lib_srcs powerpc/powerpc_init.c powerpc/filter_vsx_intrinsics.c)
4949
add_definitions(-DPNG_POWERPC_VSX_OPT=2)
5050
else()
51-
add_definitions(-DPNG_POWERPC_VSX_OPT=0)
51+
add_definitions(-DPNG_POWERPC_VSX_OPT=0)
5252
endif()
5353
endif()
5454

@@ -80,3 +80,5 @@ endif()
8080
if(NOT BUILD_SHARED_LIBS)
8181
ocv_install_target(${PNG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
8282
endif()
83+
84+
ocv_install_3rdparty_licenses(libpng LICENSE README opencv-libpng.patch)

3rdparty/libtiff/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,3 +470,5 @@ endif()
470470
if(NOT BUILD_SHARED_LIBS)
471471
ocv_install_target(${TIFF_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
472472
endif()
473+
474+
ocv_install_3rdparty_licenses(libtiff COPYRIGHT)

3rdparty/openexr/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,7 @@ if(NOT BUILD_SHARED_LIBS)
7676
ocv_install_target(IlmImf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
7777
endif()
7878

79+
ocv_install_3rdparty_licenses(openexr LICENSE AUTHORS.ilmbase AUTHORS.openexr fix_msvc2013_errors.patch)
80+
7981
set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATHS} PARENT_SCOPE)
8082
set(OPENEXR_VERSION "1.7.1" PARENT_SCOPE)

3rdparty/protobuf/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,5 @@ set(Protobuf_VERSION ${Protobuf_VERSION} CACHE INTERNAL "" FORCE)
150150
if(NOT BUILD_SHARED_LIBS)
151151
ocv_install_target(libprotobuf EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
152152
endif()
153+
154+
ocv_install_3rdparty_licenses(protobuf LICENSE README.md)

3rdparty/tbb/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,6 @@ ocv_install_target(tbb EXPORT OpenCVModules
156156
ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev
157157
)
158158

159+
ocv_install_3rdparty_licenses(tbb "${tbb_src_dir}/LICENSE" "${tbb_src_dir}/README")
160+
159161
ocv_tbb_read_version("${tbb_src_dir}/include")

0 commit comments

Comments
 (0)