From 1fe5abb47fd78d7ac835def3d58e4dbcc68500c6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 7 Oct 2020 15:36:57 +0200 Subject: FindwxWidgets: Expand list of names for wx-config This looks for the FreeBSD-packaging names of wx-config as well. Fixes: #19372 --- Modules/FindwxWidgets.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 93ac51d..eab09f1 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -760,8 +760,16 @@ else() # UNIX: Start actual work. #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. + # + # Look for wx-config -- this can be set in the environment, + # or try versioned and toolchain-versioned variants of the -config + # executable as well. find_program(wxWidgets_CONFIG_EXECUTABLE - NAMES $ENV{WX_CONFIG} wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8 + NAMES + $ENV{WX_CONFIG} + wx-config + wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8 + wxgtk3u-3.1-config wxgtk3u-3.0-config wxgtk2u-2.8-config DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) -- cgit v0.12