diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-08 12:09:55 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-08 08:10:41 -0400 |
| commit | 96dcf07d337097c2dfbda4255df43b37c98986d9 (patch) | |
| tree | e011a9f50e5db9a73bf8452e5c7c2c887544d321 | |
| parent | 736cd0f533bcbca18a25379cfbe4e9db60f7c614 (diff) | |
| parent | 1fe5abb47fd78d7ac835def3d58e4dbcc68500c6 (diff) | |
| download | cmake-96dcf07d337097c2dfbda4255df43b37c98986d9.tar.gz | |
Merge topic 'FindwxWidgets-freebsd'
1fe5abb47f FindwxWidgets: Expand list of names for wx-config
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5342
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 93ac51dee8..eab09f157a 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 ) |