diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2020-03-28 04:37:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:37:33 -0700 |
| commit | edfce3b4558644d61fbef4c88ff4bd106b0809f8 (patch) | |
| tree | 9256e71392b4f2aa7f5c957b732bb9eb35d976fd /ports/magnum/002-tools-path.patch | |
| parent | 9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e (diff) | |
| download | vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.tar.gz vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.zip | |
[magnum/magnum-plugins] Fix patches for --head builds (#10158)
* [magnum] Update patches for --head builds
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Remove obsolete patch
Since basisu port has been updated, we can now use it without patching
the magnum-plugins code for compatibility.
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade] Remove obsolete warning and flag
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Rename patches to reflect order of application
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade/magnum/magnum-plugins] Update port versions
Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat (limited to 'ports/magnum/002-tools-path.patch')
| -rw-r--r-- | ports/magnum/002-tools-path.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/ports/magnum/002-tools-path.patch b/ports/magnum/002-tools-path.patch deleted file mode 100644 index 18a351c2e..000000000 --- a/ports/magnum/002-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) |