diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2945e3c..8420bb7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,6 +36,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Install Ninja + shell: pwsh + run: | + choco install ninja - name: CMake Configure ${{ matrix.buildPreset }} shell: pwsh run: | diff --git a/Windows.Kits.cmake b/Windows.Kits.cmake index fada743..c9e1d68 100644 --- a/Windows.Kits.cmake +++ b/Windows.Kits.cmake @@ -57,7 +57,7 @@ endif() if(NOT CMAKE_WINDOWS_KITS_10_DIR) get_filename_component(CMAKE_WINDOWS_KITS_10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]" ABSOLUTE CACHE) if ("${CMAKE_WINDOWS_KITS_10_DIR}" STREQUAL "/registry") - unset(CMAKE_WINDOWS_KITS_10_DIR) + unset(CMAKE_WINDOWS_KITS_10_DIR) endif() endif() diff --git a/Windows.MSVC.toolchain.cmake b/Windows.MSVC.toolchain.cmake index 9b41b03..6e1effc 100644 --- a/Windows.MSVC.toolchain.cmake +++ b/Windows.MSVC.toolchain.cmake @@ -112,14 +112,14 @@ endif() # Find Visual Studio # if(NOT VS_INSTALLATION_PATH) - findVisualStudio( - VERSION ${CMAKE_VS_VERSION_RANGE} - PRERELEASE ${CMAKE_VS_VERSION_PRERELEASE} - PRODUCTS ${CMAKE_VS_PRODUCTS} - PROPERTIES - installationVersion VS_INSTALLATION_VERSION - installationPath VS_INSTALLATION_PATH - ) + findVisualStudio( + VERSION ${CMAKE_VS_VERSION_RANGE} + PRERELEASE ${CMAKE_VS_VERSION_PRERELEASE} + PRODUCTS ${CMAKE_VS_PRODUCTS} + PROPERTIES + installationVersion VS_INSTALLATION_VERSION + installationPath VS_INSTALLATION_PATH + ) endif() message(VERBOSE "VS_INSTALLATION_VERSION = ${VS_INSTALLATION_VERSION}") diff --git a/analyze.ps1 b/analyze.ps1 index 26abd07..61d5ad7 100644 --- a/analyze.ps1 +++ b/analyze.ps1 @@ -33,7 +33,7 @@ $Failed = $false; ForEach-Object { & $CMakeLint $_ | ForEach-Object { - if ($_ -match '^([^:]*):(\d+):(.*)$') { + if ($_ -match '^([^:]*):(\d+)(,\d+)?:(.*)$') { ReportError -File $Matches[1] -LineNumber $Matches[2] -Message $_ $Failed = $true } else {