diff options
| author | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-19 22:05:31 (GMT) |
|---|---|---|
| committer | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-19 22:05:31 (GMT) |
| commit | 9b503cc86e047fb8d9929e49f96f82f2a74af562 (patch) | |
| tree | 38d0731267c75d9fd0dc13161f878b7e0cf428c8 | |
| parent | 85ae0ba796c26b9ba2f7025e267d3f438db388c6 (diff) | |
| download | CMake-9b503cc86e047fb8d9929e49f96f82f2a74af562.zip CMake-9b503cc86e047fb8d9929e49f96f82f2a74af562.tar.gz CMake-9b503cc86e047fb8d9929e49f96f82f2a74af562.tar.bz2 | |
wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars
Issue: #17492
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindwxWindows.cmake | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index e08afe4..e21ec38 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)" ) diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake index 054a1bf..115cdc6 100644 --- a/Modules/FindwxWindows.cmake +++ b/Modules/FindwxWindows.cmake @@ -617,7 +617,8 @@ else() # wx-config should be in your path anyhow, usually no need to set WXWIN or # search in ../wx or ../../wx - find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config + find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE + NAMES $ENV{WX_CONFIG} wx-config HINTS ENV WXWIN $ENV{WXWIN}/bin |