From d4fbcd8a2d1f8d707c30ea9cd393276e5cf85329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Wed, 23 Nov 2016 07:21:51 +0000
Subject: [PATCH] INCLUDE env now not needed

git-svn-id: svn://db.shs.com.ru/libs@136 a8b55f48-bf90-11e4-a774-851b48703e85
---
 FindMinGW.cmake | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/FindMinGW.cmake b/FindMinGW.cmake
index fcd5208..76a3e39 100644
--- a/FindMinGW.cmake
+++ b/FindMinGW.cmake
@@ -2,7 +2,17 @@ if (${MINGW})
 if (NOT DEFINED MINGW_DIR)
 	get_filename_component(MINGW_BIN ${CMAKE_C_COMPILER} PATH)
 	get_filename_component(MINGW_DIR ${MINGW_BIN} PATH)
-	find_path(MINGW_INCLUDE windows.h HINTS ${MINGW_DIR}/include)
+	find_path(MINGW_INCLUDE
+		windows.h 
+	PATHS 
+		EVN INCLUDE
+		${MINGW_DIR}
+		${MINGW_DIR}/i686-w64-mingw32
+		${MINGW_DIR}/x86_64-w64-mingw32
+	PATH_SUFFIXES
+		include)
+	#message(STATUS "Find MinGW  = ${MINGW_INCLUDE}")
+	#if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include
 	find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib)
 	get_filename_component(MINGW_LIB ${MINGW_LIB} PATH)
 	message(STATUS "Find MinGW binary path = ${MINGW_BIN}")