kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'wxWidgets-paths' 

33286235 FindwxWidgets: Improve path detection logic when cross-compiling.
This commit is contained in:
Brad King 2014-08-27 09:04:53 -04:00 committed by CMake Topic Stage
parent 7c694368dd 3328623504
commit 869e1a4618
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindwxWidgets.cmake
View File

@ -229,13 +229,12 @@ else()
endif() 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") set(wxWidgets_FIND_STYLE "win32")
else() else()
if(UNIX OR MSYS) set(wxWidgets_FIND_STYLE "unix")
set(wxWidgets_FIND_STYLE "unix")
endif()
endif() endif()
#===================================================================== #=====================================================================