mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 11:21:38 +08:00
7b9275f1b3
Removed plugin location defines. Fixed tools search path in FindCorrade, FindMagnum cmake modules.
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)
|