diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 13:19:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-08 13:19:39 (GMT) |
| commit | a20ca0c603659b6b53e680d377540d4f8057b208 (patch) | |
| tree | 82f75d30a05bca06aa7622c5c23a0a2f36cb86fa | |
| parent | a97b910655af03787fbb4dca64752602d14d3910 (diff) | |
| parent | 2c9697431528ce78aa3aab9c0e1849641d9f61ec (diff) | |
| download | CMake-a20ca0c603659b6b53e680d377540d4f8057b208.zip CMake-a20ca0c603659b6b53e680d377540d4f8057b208.tar.gz CMake-a20ca0c603659b6b53e680d377540d4f8057b208.tar.bz2 | |
Merge branch 'FindwxWidgets-versioned-executable' into release
| -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 ) |