35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 33286235048495ceafb636d549d9a4e8891967ae Mon Sep 17 00:00:00 2001
|
|
From: "Richard M. Shaw" <hobbes1069@gmail.com>
|
|
Date: Fri, 22 Aug 2014 11:35:00 -0500
|
|
Subject: [PATCH] FindwxWidgets: Improve path detection logic when
|
|
cross-compiling.
|
|
|
|
---
|
|
Modules/FindwxWidgets.cmake | 7 +++----
|
|
1 file 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()
|
|
|
|
#=====================================================================
|
|
--
|
|
1.7.10.4
|
|
|