diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-30 14:32:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-30 14:32:13 (GMT) |
| commit | 088d27c38bf8d6c5e016d0632943551142f5326b (patch) | |
| tree | 7fae60cdf0b999017433974d3924d5819f63a31b /Modules | |
| parent | 1c3158558c1a9f90d4ab9a675f182c65c1951864 (diff) | |
| parent | 1b04561edbe28f920561ca08855c8595b463d24b (diff) | |
| download | CMake-088d27c38bf8d6c5e016d0632943551142f5326b.zip CMake-088d27c38bf8d6c5e016d0632943551142f5326b.tar.gz CMake-088d27c38bf8d6c5e016d0632943551142f5326b.tar.bz2 | |
Merge topic 'FindwxWidgets-versioned-executable'
1b04561e FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index dec0ddf..c16c011 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -740,7 +740,7 @@ else() # UNIX: Start actual work. #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. - find_program(wxWidgets_CONFIG_EXECUTABLE wx-config + find_program(wxWidgets_CONFIG_EXECUTABLE wx-config wx-config-3.0 DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) |