From 165f2b1888c86050d2bc43943311416b7f2dee25 Mon Sep 17 00:00:00 2001 From: Baruch Date: Tue, 1 May 2012 23:00:24 +0300 Subject: [PATCH] fix for static builds with mingw-w64 compilers - part 1 --- cmake/Config.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/Config.cmake b/cmake/Config.cmake index 7fed4ac4a..ce9bb2c14 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -1,4 +1,3 @@ - # detect the OS if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS 1) @@ -47,6 +46,11 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) set(COMPILER_GCC 1) execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpversion" OUTPUT_VARIABLE GCC_VERSION_OUTPUT) string(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" GCC_VERSION "${GCC_VERSION_OUTPUT}") + execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpmachine" OUTPUT_VARIABLE GCC_MACHINE) + string(STRIP "${GCC_MACHINE}" GCC_MACHINE) + if(${GCC_MACHINE} MATCHES ".*w64.*") + set(COMPILER_GCC_W64 1) + endif() elseif(MSVC) set(COMPILER_MSVC 1) if(MSVC_VERSION EQUAL 1400)