FFmpeg: correct licenses install location
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 5 Oct 2018 13:38:44 +0000 (16:38 +0300)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 5 Oct 2018 14:10:42 +0000 (17:10 +0300)
3rdparty/ffmpeg/ffmpeg-download.ps1.in
3rdparty/ffmpeg/ffmpeg.cmake

index 589aa14..e92ef45 100644 (file)
@@ -4,7 +4,7 @@ $output = "$PSScriptRoot\@OPENCV_BIN_INSTALL_PATH@\opencv_ffmpeg@OPENCV_DLLVERSI
 
 Write-Output ("=" * 120)
 try {
-    Get-content -Path "$PSScriptRoot\etc\licenses\ffmpeg-readme.txt" -ErrorAction 'Stop'
+    Get-content -Path "$PSScriptRoot\@OPENCV_LICENSES_INSTALL_PATH@\ffmpeg-readme.txt" -ErrorAction 'Stop'
 } catch {
     Write-Output "Refer to OpenCV FFmpeg wrapper readme notes about library usage / licensing details."
 }
index cfa8ff4..c8ac9d5 100644 (file)
@@ -40,3 +40,5 @@ if(OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT)
   configure_file("${CMAKE_CURRENT_LIST_DIR}/ffmpeg-download.ps1.in" "${CMAKE_BINARY_DIR}/win-install/ffmpeg-download.ps1" @ONLY)
   install(FILES "${CMAKE_BINARY_DIR}/win-install/ffmpeg-download.ps1" DESTINATION "." COMPONENT libs)
 endif()
+
+ocv_install_3rdparty_licenses(ffmpeg license.txt readme.txt)