Merge remote-tracking branch 'github/master' into mt-trace

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09633c14f98a08fe2cf61f6dc2e45f4bad782b21..f019049e3f561e9f395ee23cfc481621fa443da2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,11 +35,17 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
 # Find dependencies
 
 # Ensure __thread is support
-if (APPLE)
+if (NOT MSVC)
     include (CheckCXXSourceCompiles)
     check_cxx_source_compiles("__thread int i; int main() { return 0; }" HAVE_COMPILER_TLS)
     if (NOT HAVE_COMPILER_TLS)
-        message (FATAL_ERROR "C++ compiler does not support __thread keyword. Please install XCode 4.5 or higher.")
+        if (APPLE)
+            message (FATAL_ERROR "C++ compiler does not support __thread keyword. Please install XCode 4.5 or higher.")
+        else (MINGW32)
+            message (FATAL_ERROR "C++ compiler does not support __thread keyword. Please use MinGW g++ version 4.4 or higher")
+        else ()
+            message (FATAL_ERROR "C++ compiler does not support __thread keyword.")
+        endif ()
     endif ()
 endif ()