diff --git a/helpers/vcpkg/ports/zeroc-ice/CONTROL b/helpers/vcpkg/ports/zeroc-ice-mumble/CONTROL similarity index 93% rename from helpers/vcpkg/ports/zeroc-ice/CONTROL rename to helpers/vcpkg/ports/zeroc-ice-mumble/CONTROL index 31c8e7449..b72dc858d 100644 --- a/helpers/vcpkg/ports/zeroc-ice/CONTROL +++ b/helpers/vcpkg/ports/zeroc-ice-mumble/CONTROL @@ -1,4 +1,4 @@ -Source: zeroc-ice +Source: zeroc-ice-mumble Version: 3.7.3 Homepage: https://github.com/zeroc-ice/ice Description: Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more. diff --git a/helpers/vcpkg/ports/zeroc-ice/portfile.cmake b/helpers/vcpkg/ports/zeroc-ice-mumble/portfile.cmake similarity index 100% rename from helpers/vcpkg/ports/zeroc-ice/portfile.cmake rename to helpers/vcpkg/ports/zeroc-ice-mumble/portfile.cmake diff --git a/scripts/vcpkg/get_mumble_dependencies.ps1 b/scripts/vcpkg/get_mumble_dependencies.ps1 index 77d21332e..31c8428c3 100644 --- a/scripts/vcpkg/get_mumble_dependencies.ps1 +++ b/scripts/vcpkg/get_mumble_dependencies.ps1 @@ -19,7 +19,7 @@ $mumble_deps = "qt5-base", "libmariadb", "mdnsresponder", "zlib", - "zeroc-ice" + "zeroc-ice-mumble" $ErrorActionPreference = 'Stop' @@ -59,9 +59,9 @@ try { } if (Test-Path $vcpkgdir) { - if (-not (Test-Path $vcpkgdir/ports/zeroc-ice)) { - Write-Host "Adding ports for ZeroC Ice..." - Copy-Item -Path $PSScriptRoot/../../helpers/vcpkg/ports/zeroc-ice -Destination $vcpkgdir/ports -Recurse + if (-not (Test-Path $vcpkgdir/ports/zeroc-ice-mumble)) { + Write-Host "Adding port for ZeroC Ice..." + Copy-Item -Path $PSScriptRoot/../../helpers/vcpkg/ports/zeroc-ice-mumble -Destination $vcpkgdir/ports -Recurse } cd $vcpkgdir diff --git a/scripts/vcpkg/get_mumble_dependencies.sh b/scripts/vcpkg/get_mumble_dependencies.sh index 69e30f020..c3d68e308 100755 --- a/scripts/vcpkg/get_mumble_dependencies.sh +++ b/scripts/vcpkg/get_mumble_dependencies.sh @@ -53,7 +53,7 @@ mumble_deps='qt5-base, libsndfile, libmariadb, zlib, - zeroc-ice' + zeroc-ice-mumble' # Determine vcpkg triplet from OS https://github.com/Microsoft/vcpkg/blob/master/docs/users/triplets.md # Available triplets can be printed with `vcpkg help triplet` @@ -74,7 +74,7 @@ fi if [ -d "$VCPKGDIR" ] then # copy ZeroC Ice port files - cp -R helpers/vcpkg/ports/zeroc-ice $VCPKGDIR/ports + cp -R helpers/vcpkg/ports/zeroc-ice-mumble $VCPKGDIR/ports cd $VCPKGDIR if [ ! -x $VCPKGDIR/vcpkg ]