Emil,
After my piglit change, I had to fix it as
http://cgit.freedesktop.org/piglit/commit/?id=1dca1680c1b29cf1eb242cf8c51e157ca88c929d
otherwise CMake would complain about invalid syntax outside MSVC.
With that,
Reviewed-by: Jose Fonseca <jfons...@vmware.com>
Jose
On 05/02/15 16:48, Emil Velikov wrote:
Currently we mix variable declarations and code, as allowed in the C99
standard. On the other hand, MSVC 2013 prior to Update 4, seems to have
problems with such code in some corner cases.
Considering it's a free update bump the requirement, and add an explicit
check in the build system. Latter of which shamelessly copied from piglit.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
CMakeLists.txt | 5 +++++
README.txt | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bbe387..7b34160 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,11 @@ if(waffle_build_tests)
include(WaffleCMocka)
endif()
+# Require MSVC 2013 U4
+if (${MSVC} AND ${CMAKE_C_COMPILER_VERSION} VERSION_LESS 18.00.31101.0)
+ message (FATAL_ERROR "Visual Studio 2013 Update 4 or later required")
+endif ()
+
find_package(PkgConfig)
#
------------------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index c9ffee2..d37e109 100644
--- a/README.txt
+++ b/README.txt
@@ -120,7 +120,7 @@ Download and install the latest version CMake from the
official website:
https://urldefense.proofpoint.com/v2/url?u=http-3A__cmake.org_&d=AwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=zfmBZnnVGHeYde45pMKNnVyzeaZbdIqVLprmZCM2zzE&m=nNtXnHzuAk5hPwtwGrgxfMXqC38r0N67lMvo2tVn4uI&s=EwNY6JADl8A6pX-r8HaPaKhzyAXhhacMFmSpzh_whB8&e=
-Install Microsoft Visual Studio 2013* or later.
+Install Microsoft Visual Studio 2013 Update 4* or later.
Install 'Visual C++' feature.
Download OpenGL Core API and Extension Header Files.
_______________________________________________
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
