Skip to content

Commit 4fa4bef

Browse files
committed
cmake: fix licenses install rules
1 parent 69ff7a7 commit 4fa4bef

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

3rdparty/libpng/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ if(NOT BUILD_SHARED_LIBS)
8484
ocv_install_target(${PNG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
8585
endif()
8686

87-
ocv_install_3rdparty_licenses(libpng LICENSE README opencv-libpng.patch)
87+
ocv_install_3rdparty_licenses(libpng LICENSE README)

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ if(ANDROID)
582582
ocv_update(OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include)
583583
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native)
584584
ocv_update(OPENCV_OTHER_INSTALL_PATH sdk/etc)
585+
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${OPENCV_OTHER_INSTALL_PATH}/licenses")
585586
else()
586587
set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib")
587588
ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
@@ -597,13 +598,15 @@ else()
597598
ocv_update(OPENCV_JAR_INSTALL_PATH java)
598599
ocv_update(OPENCV_OTHER_INSTALL_PATH etc)
599600
ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
601+
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${OPENCV_OTHER_INSTALL_PATH}/licenses")
600602
else()
601603
include(GNUInstallDirs)
602604
ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR})
603605
ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
604606
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
605607
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
606608
ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
609+
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/licenses/opencv3")
607610

608611
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
609612
math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")

cmake/OpenCVFindIPP.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,12 @@ if(NOT DEFINED IPPROOT)
245245
return()
246246
endif()
247247
set(IPPROOT "${ICV_PACKAGE_ROOT}/icv")
248-
ocv_install_3rdparty_licenses(ippicv "${IPPROOT}/readme.htm" "${ICV_PACKAGE_ROOT}/EULA.txt")
248+
ocv_install_3rdparty_licenses(ippicv "${IPPROOT}/readme.htm")
249+
if(WIN32)
250+
ocv_install_3rdparty_licenses(ippicv "${ICV_PACKAGE_ROOT}/EULA.rtf")
251+
else()
252+
ocv_install_3rdparty_licenses(ippicv "${ICV_PACKAGE_ROOT}/EULA.txt")
253+
endif()
249254
endif()
250255

251256
file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)

cmake/OpenCVFindIPPIW.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,13 @@ if(BUILD_IPP_IW)
148148

149149
set(IPPIW_ROOT "${IPPROOT}/../iw")
150150
ocv_install_3rdparty_licenses(ippiw
151-
"${IPPIW_ROOT}/../EULA.txt"
152151
"${IPPIW_ROOT}/../support.txt"
153152
"${IPPIW_ROOT}/../third-party-programs.txt")
153+
if(WIN32)
154+
ocv_install_3rdparty_licenses(ippiw "${IPPIW_ROOT}/../EULA.rtf")
155+
else()
156+
ocv_install_3rdparty_licenses(ippiw "${IPPIW_ROOT}/../EULA.txt")
157+
endif()
154158

155159
# Package sources
156160
get_filename_component(__PATH "${IPPROOT}/../iw/" ABSOLUTE)

cmake/OpenCVUtils.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,13 +1200,17 @@ endfunction()
12001200
# ocv_install_3rdparty_licenses(<library-name> <filename1> [<filename2> ..])
12011201
function(ocv_install_3rdparty_licenses library)
12021202
foreach(filename ${ARGN})
1203+
set(filepath "${filename}")
1204+
if(NOT IS_ABSOLUTE "${filepath}")
1205+
set(filepath "${CMAKE_CURRENT_LIST_DIR}/${filepath}")
1206+
endif()
12031207
get_filename_component(name "${filename}" NAME)
12041208
install(
1205-
FILES "${filename}"
1206-
DESTINATION "${OPENCV_OTHER_INSTALL_PATH}/licenses"
1209+
FILES "${filepath}"
1210+
DESTINATION "${OPENCV_LICENSES_INSTALL_PATH}"
12071211
COMPONENT licenses
12081212
RENAME "${library}-${name}"
1209-
OPTIONAL)
1213+
)
12101214
endforeach()
12111215
endfunction()
12121216

0 commit comments

Comments
 (0)