Commit Graph

18 Commits

Author SHA1 Message Date
autoantwort
bc0ba361cd
[magnum] fix build of vk feature (#39806) 2024-07-13 10:29:15 -04:00
Kai Pastor
47633daa65
[vcpkg-scripts] Catch use of ambiguous cmake vars (#34546)
Avoid wrong use of popular but ambiguous variables (`WIN32` etc.) in
scripts and portfiles by detection in CI.

Sometimes the variables are used wrongly, and sometimes this isn't
caught in PR review. This PR tries to catch those variables (when in the
active code path in script mode). [This can happen to every
contributor](https://github.com/microsoft/vcpkg/pull/34356#discussion_r1360074122),
even if he/she knows the rules ... vcpkg is raising the bar higher than
usual, having to deal with targets and hosts even in script mode.

(`b2-options.cmake` (boost fragment) shows where we get if we don't pay
attention: the same code being used in script mode (`WIN32` meaning
host) and in project mode (`WIN32` meaning target).)

The new check doesn't break any user builds because it relies on command
line options. However it changes the ABI hashes.
2024-06-14 11:40:01 -07:00
autoantwort
a37c3c2399
[magnum] fix features (#34980) 2023-11-09 11:16:28 -08:00
autoantwort
21fb5a698c
[magnum] remove empty dirs (#34900) 2023-11-06 10:22:30 -08:00
autoantwort
6c83d489f2
[magnum] use supports expressions (#34741) 2023-11-01 13:37:36 -07:00
autoantwort
62c3efbafd
[magnum] fix cross compile (#33780) 2023-09-19 09:47:30 -07:00
jim wang
9055f88ba5
[magnum] Fix compile feature-wavaudioimporter error (#32256)
* Fix compile wavaudioimporter error

* update version

* Fix compile feature-wavaudioimporter error

* update version
2023-06-29 14:44:18 -07:00
autoantwort
4c099a9614
[magnum] fix dependencies (#30138) 2023-03-13 11:36:28 -07:00
Nick
f9b5f5406b
[sdl2] update to 2.24.0 (#26436) 2022-08-31 13:34:35 -07:00
Frank
17ee0b59f2
[openal-soft] Update to 1.22.0 (#25327)
* [openal-soft] Update to 1.22.0

* update version

* add license

* overwrite versions

* update version

* add patch

* update version

* add license

* update version

* update patch

* overwrite version
2022-06-28 12:46:16 -07:00
LilyWangLL
2e18a52428
[magnum] Fix feature glfwapplication find glfw failed (#22272)
* [magnum] Fix feature glfwapplication find glfw failed

* update version

* update portfile.cmake

* update version

* update portfile.cmake

* update version

* update version

* update version

* More double quotes

* version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-01-03 13:24:17 -08:00
pezcode
9df0b27226
[magnum] Move static debug libraries to root lib/ folder (#21328)
* [magnum] Move static debug libraries to root lib/ folder

* [magnum] Replace deprecated functions

* [magnum] Update version
2021-11-23 12:06:57 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -07:00
Jonathan Hale
8655bfd4b3
[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435)
* [magnum/-plugins] Remove obsolete patches that no longer apply

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade] Make feature to flag translation consistent to fix warning

Consistent with magnum & magnum-plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix warning message for dlls without matching pdbs always displayed

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix the baseline version

* Revert the changes in vcpkg_copy_pdbs.cmake

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-09-02 13:24:33 -07:00
Jonathan Hale
70610f4494
[magnum,-plugins] Fix deprecated use of vcpkg_check_features (#17016)
Signed-off-by: Squareys <squareys@googlemail.com>
2021-04-29 13:49:04 -07:00
Jonathan Hale
e7377f7992
[magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (#16245)
* [magnum] Correctly deploy shaderconverter and sceneconverter plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Only remove plugin lib dirs for Windows platforms

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Clean up deletion of plugin libs and clarify in comment

Signed-off-by: Squareys <squareys@googlemail.com>

* Update versions

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-02-18 13:02:27 -08:00
Jonathan Hale
795588570a
[magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163)
* [magnum,magnum-plugins] Add vulkan and shaderconverter features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Add warning for features unavailable in non-head version

Signed-off-by: Squareys <squareys@googlemail.com>

* update version record

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-01-26 15:03:54 -08:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00