diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 13:12:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-08 13:13:29 (GMT) |
| commit | 2c9697431528ce78aa3aab9c0e1849641d9f61ec (patch) | |
| tree | 30c55328a9ab75db882ddebe03bb919e6dd6bc44 /Modules/FindwxWidgets.cmake | |
| parent | 1b04561edbe28f920561ca08855c8595b463d24b (diff) | |
| download | CMake-2c9697431528ce78aa3aab9c0e1849641d9f61ec.zip CMake-2c9697431528ce78aa3aab9c0e1849641d9f61ec.tar.gz CMake-2c9697431528ce78aa3aab9c0e1849641d9f61ec.tar.bz2 | |
FindwxWidgets: Fix find_program call for versioned names
In commit v3.3.0-rc1~132^2 (FindwxWidgets: Search for wx-config-3.0 in
addition to wx-config, 2015-04-29) we added a second (versioned) name to
the find_program call. Specifying multiple names requires use of the
NAMES option. Add it now. While at it, also add versioned names for
2.9 and 2.8.
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index c16c011..9a70678 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -740,7 +740,8 @@ else() # UNIX: Start actual work. #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. - find_program(wxWidgets_CONFIG_EXECUTABLE wx-config wx-config-3.0 + find_program(wxWidgets_CONFIG_EXECUTABLE + NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8 DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) |