mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-11 17:49:38 -06:00
Merge topic 'wxWidgets-paths'
33286235 FindwxWidgets: Improve path detection logic when cross-compiling.
This commit is contained in:
@@ -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()
|
||||
|
||||
#=====================================================================
|
||||
|
||||
Reference in New Issue
Block a user