diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-27 13:04:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-27 13:04:53 (GMT) |
| commit | 869e1a4618db925e3c06746dfaba43241435d129 (patch) | |
| tree | 410135014aa6a319cf364e1058b3ba3b603750fd | |
| parent | 7c694368dd4a32aab29a0cf5bf2d3825f5a26f26 (diff) | |
| parent | 33286235048495ceafb636d549d9a4e8891967ae (diff) | |
| download | CMake-869e1a4618db925e3c06746dfaba43241435d129.zip CMake-869e1a4618db925e3c06746dfaba43241435d129.tar.gz CMake-869e1a4618db925e3c06746dfaba43241435d129.tar.bz2 | |
Merge topic 'wxWidgets-paths'
33286235 FindwxWidgets: Improve path detection logic when cross-compiling.
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 45596a0..7ef06a8 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -229,13 +229,12 @@ else() endif() #===================================================================== +# Determine whether unix or win32 paths should be used #===================================================================== -if(WIN32 AND NOT CYGWIN AND NOT MSYS) +if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING) set(wxWidgets_FIND_STYLE "win32") else() - if(UNIX OR MSYS) - set(wxWidgets_FIND_STYLE "unix") - endif() + set(wxWidgets_FIND_STYLE "unix") endif() #===================================================================== |