diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d659ac7b..2decc97c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -119,7 +119,8 @@ $toolsList = @( (Get-WinAppDriver), (Get-WixVersion), (Get-ZstdVersion), - (Get-YAMLLintVersion) + (Get-YAMLLintVersion), + (Get-ImageMagickVersion) ) if (Test-IsWin19) { $toolsList += @( diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e85b328f..1f553d11 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -307,3 +307,9 @@ function Get-SwigVersion { $swigVersion = $Matches.Version return "Swig $swigVersion" } + +function Get-ImageMagickVersion { + (magick -version | Select-String -Pattern "Version") -match "(?\d+\.\d+\.\d+-\d+)" | Out-Null + $magickVersion = $Matches.Version + return "ImageMagick $magickVersion" +} diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 949f29ef..b6a16828 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -102,4 +102,10 @@ Describe "CMake" { It "cmake" { "cmake --version" | Should -ReturnZeroExitCode } +} + +Describe "ImageMagick" { + It "ImageMagick" { + "magick -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a29fdc05..56e6a73e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -461,7 +461,8 @@ { "name": "cmake.install", "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] - } + }, + { "name": "imagemagick" } ] }, "node": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index fbac8fbb..eb0839bc 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -375,7 +375,8 @@ { "name": "cmake.install", "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] - } + }, + { "name": "imagemagick" } ] }, "node": {