diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2021-09-02 22:24:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:24:33 -0700 |
| commit | 8655bfd4b311df8dd853ca49969a9ecfac94ea91 (patch) | |
| tree | 094312d9e50a82e7c7bce576aa13779936239995 /ports/magnum | |
| parent | a35b42633c56923608a4f7222d4aa7b996015bf2 (diff) | |
| download | vcpkg-8655bfd4b311df8dd853ca49969a9ecfac94ea91.tar.gz vcpkg-8655bfd4b311df8dd853ca49969a9ecfac94ea91.zip | |
[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>
Diffstat (limited to 'ports/magnum')
| -rw-r--r-- | ports/magnum/001-tools-path.patch | 26 | ||||
| -rw-r--r-- | ports/magnum/CONTROL | 2 | ||||
| -rw-r--r-- | ports/magnum/portfile.cmake | 1 |
3 files changed, 1 insertions, 28 deletions
diff --git a/ports/magnum/001-tools-path.patch b/ports/magnum/001-tools-path.patch deleted file mode 100644 index 18a351c2e..000000000 --- a/ports/magnum/001-tools-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake -index e63bc03..052006f 100644 ---- a/modules/FindCorrade.cmake -+++ b/modules/FindCorrade.cmake -@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS}) - if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS}) - add_executable(Corrade::${_component} IMPORTED) - -- find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component}) -+ find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade) - mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE) - - if(CORRADE_${_COMPONENT}_EXECUTABLE) -diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake -index 8df555d..12f7aa4 100644 ---- a/modules/FindMagnum.cmake -+++ b/modules/FindMagnum.cmake -@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) - if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS}) - add_executable(Magnum::${_component} IMPORTED) - -- find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component}) -+ find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum) - mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE) - - if(MAGNUM_${_COMPONENT}_EXECUTABLE) diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index b595fa45c..1383eb1f8 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,6 +1,6 @@ Source: magnum Version: 2020.06 -Port-Version: 5 +Port-Version: 6 Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index e4144595e..d060c4b9a 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github( SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042 HEAD_REF master PATCHES - 001-tools-path.patch 002-sdl-includes.patch ) |