third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: fix licenses install rules

Browse Source
This commit is contained in:
Alexander Alekhin 2019-04-02 17:47:03 +03:00
parent 69ff7a76d6
commit 4fa4bef41d
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libpng/CMakeLists.txt vendored
View File

@ -84,4 +84,4 @@ if(NOT BUILD_SHARED_LIBS)
ocv_install_target(${PNG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev) ocv_install_target(${PNG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev)
endif() endif()
ocv_install_3rdparty_licenses(libpng LICENSE README opencv-libpng.patch) ocv_install_3rdparty_licenses(libpng LICENSE README)

3
CMakeLists.txt
View File

@ -582,6 +582,7 @@ if(ANDROID)
ocv_update(OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include) ocv_update(OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include)
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native) ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native)
ocv_update(OPENCV_OTHER_INSTALL_PATH sdk/etc) ocv_update(OPENCV_OTHER_INSTALL_PATH sdk/etc)
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${OPENCV_OTHER_INSTALL_PATH}/licenses")
else() else()
set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib")
ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
@ -597,6 +598,7 @@ else()
ocv_update(OPENCV_JAR_INSTALL_PATH java) ocv_update(OPENCV_JAR_INSTALL_PATH java)
ocv_update(OPENCV_OTHER_INSTALL_PATH etc) ocv_update(OPENCV_OTHER_INSTALL_PATH etc)
ocv_update(OPENCV_CONFIG_INSTALL_PATH ".") ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${OPENCV_OTHER_INSTALL_PATH}/licenses")
else() else()
include(GNUInstallDirs) include(GNUInstallDirs)
ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}) ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR})
@ -604,6 +606,7 @@ else()
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples) ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java) ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV) ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/licenses/opencv3")
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH) if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")

7
cmake/OpenCVFindIPP.cmake
View File

@ -245,7 +245,12 @@ if(NOT DEFINED IPPROOT)
return() return()
endif() endif()
set(IPPROOT "${ICV_PACKAGE_ROOT}/icv") set(IPPROOT "${ICV_PACKAGE_ROOT}/icv")
ocv_install_3rdparty_licenses(ippicv "${IPPROOT}/readme.htm" "${ICV_PACKAGE_ROOT}/EULA.txt") ocv_install_3rdparty_licenses(ippicv "${IPPROOT}/readme.htm")
if(WIN32)
ocv_install_3rdparty_licenses(ippicv "${ICV_PACKAGE_ROOT}/EULA.rtf")
else()
ocv_install_3rdparty_licenses(ippicv "${ICV_PACKAGE_ROOT}/EULA.txt")
endif()
endif() endif()
file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT) file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)

6
cmake/OpenCVFindIPPIW.cmake
View File

@ -148,9 +148,13 @@ if(BUILD_IPP_IW)
set(IPPIW_ROOT "${IPPROOT}/../iw") set(IPPIW_ROOT "${IPPROOT}/../iw")
ocv_install_3rdparty_licenses(ippiw ocv_install_3rdparty_licenses(ippiw
"${IPPIW_ROOT}/../EULA.txt"
"${IPPIW_ROOT}/../support.txt" "${IPPIW_ROOT}/../support.txt"
"${IPPIW_ROOT}/../third-party-programs.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()
# Package sources # Package sources
get_filename_component(__PATH "${IPPROOT}/../iw/" ABSOLUTE) get_filename_component(__PATH "${IPPROOT}/../iw/" ABSOLUTE)

10
cmake/OpenCVUtils.cmake
View File

@ -1200,13 +1200,17 @@ endfunction()
# ocv_install_3rdparty_licenses(<library-name> <filename1> [<filename2> ..]) # ocv_install_3rdparty_licenses(<library-name> <filename1> [<filename2> ..])
function(ocv_install_3rdparty_licenses library) function(ocv_install_3rdparty_licenses library)
foreach(filename ${ARGN}) foreach(filename ${ARGN})
set(filepath "${filename}")
if(NOT IS_ABSOLUTE "${filepath}")
set(filepath "${CMAKE_CURRENT_LIST_DIR}/${filepath}")
endif()
get_filename_component(name "${filename}" NAME) get_filename_component(name "${filename}" NAME)
install( install(
FILES "${filename}" FILES "${filepath}"
DESTINATION "${OPENCV_OTHER_INSTALL_PATH}/licenses" DESTINATION "${OPENCV_LICENSES_INSTALL_PATH}"
COMPONENT licenses COMPONENT licenses
RENAME "${library}-${name}" RENAME "${library}-${name}"
OPTIONAL) )
endforeach() endforeach()
endfunction() endfunction()