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}")