mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 11:41:36 +08:00
edfce3b455
* [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>
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
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)
|