diff options
| author | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-19 23:05:31 +0100 |
|---|---|---|
| committer | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-19 23:05:31 +0100 |
| commit | 9b503cc86e047fb8d9929e49f96f82f2a74af562 (patch) | |
| tree | 38d0731267c75d9fd0dc13161f878b7e0cf428c8 /Modules/FindwxWidgets.cmake | |
| parent | 85ae0ba796c26b9ba2f7025e267d3f438db388c6 (diff) | |
| download | cmake-9b503cc86e047fb8d9929e49f96f82f2a74af562.tar.gz | |
wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars
Issue: #17492
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index e08afe433e..e21ec388ac 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -751,7 +751,7 @@ else() #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. find_program(wxWidgets_CONFIG_EXECUTABLE - NAMES 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 DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) @@ -964,8 +964,9 @@ find_package_handle_standard_args(wxWidgets #===================================================================== # Resource file compiler. -find_program(wxWidgets_wxrc_EXECUTABLE wxrc - ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw +find_program(wxWidgets_wxrc_EXECUTABLE + NAMES $ENV{WXRC_CMD} wxrc + PATHS ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw DOC "Location of wxWidgets resource file compiler binary (wxrc)" ) |