Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FFmpeg: correct licenses install location

Browse Source
pull/12753/head
Maksim Shabunin 7 years ago
parent c716e374c1
commit 09ef4c9cff
2 changed files with 3 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      3rdparty/ffmpeg/ffmpeg-download.ps1.in
  2. 2
      3rdparty/ffmpeg/ffmpeg.cmake

2
3rdparty/ffmpeg/ffmpeg-download.ps1.in vendored
Unescape View File

@ -4,7 +4,7 @@ $output = "$PSScriptRoot\@OPENCV_BIN_INSTALL_PATH@\opencv_ffmpeg@OPENCV_DLLVERSI
Write-Output ("=" * 120) Write-Output ("=" * 120)
try { 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 { } catch {
Write-Output "Refer to OpenCV FFmpeg wrapper readme notes about library usage / licensing details." Write-Output "Refer to OpenCV FFmpeg wrapper readme notes about library usage / licensing details."
} }

2
3rdparty/ffmpeg/ffmpeg.cmake vendored
Unescape View 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) 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) install(FILES "${CMAKE_BINARY_DIR}/win-install/ffmpeg-download.ps1" DESTINATION "." COMPONENT libs)
endif() endif()
ocv_install_3rdparty_licenses(ffmpeg license.txt readme.txt)

Write Preview
Loading…
Cancel
Save