diff options
| author | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-21 10:55:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-21 10:55:12 (GMT) |
| commit | 8f8f118327e25a3af912b504dcb3ebad5c841818 (patch) | |
| tree | dfec9833025ac2ebce15dab36fc3028a95ba6468 | |
| parent | e91e69cfb5a9bdb1cad7a6442913c15af88ce5ad (diff) | |
| parent | 9b503cc86e047fb8d9929e49f96f82f2a74af562 (diff) | |
| download | CMake-8f8f118327e25a3af912b504dcb3ebad5c841818.zip CMake-8f8f118327e25a3af912b504dcb3ebad5c841818.tar.gz CMake-8f8f118327e25a3af912b504dcb3ebad5c841818.tar.bz2 | |
Merge topic 'wxwidgets-env-variables'
9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1504
| -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 |