diff --git a/cmake/OpenCVFindIPPIW.cmake b/cmake/OpenCVFindIPPIW.cmake index bd3b0b8422..5c3d8a0ea2 100644 --- a/cmake/OpenCVFindIPPIW.cmake +++ b/cmake/OpenCVFindIPPIW.cmake @@ -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\tno") 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\tno") 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()