[Bf-blender-cvs] [d1980ef] depsgraph_refactor: Depsgraph: Workaround to be able to compile with Clang
Sergey Sharybin
noreply at git.blender.org
Thu Nov 27 17:32:29 CET 2014
Commit: d1980ef7bec1aba577a0897bc8ed20bcf1ff19ad
Author: Sergey Sharybin
Date: Thu Nov 27 21:20:10 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBd1980ef7bec1aba577a0897bc8ed20bcf1ff19ad
Depsgraph: Workaround to be able to compile with Clang
===================================================================
M CMakeLists.txt
M extern/clew/include/clew.h
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f93c476..5c0dc66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2607,9 +2607,9 @@ endif()
# Enable C++11
if(CMAKE_COMPILER_IS_GNUCC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -U__STRICT_ANSI__")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -U__STRICT_ANSI__")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
# Include warnings first, so its possible to disable them with user defined flags
diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
index 328fd52..6265eb1 100644
--- a/extern/clew/include/clew.h
+++ b/extern/clew/include/clew.h
@@ -505,14 +505,14 @@ typedef unsigned int cl_GLenum;
#endif
/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */
-#if (defined( __GNUC__) && ! defined( __STRICT_ANSI__ )) || (defined( _MSC_VER ) && ! defined( __STDC__ ))
+//#if (defined( __GNUC__) && ! defined( __STRICT_ANSI__ )) || (defined( _MSC_VER ) && ! defined( __STDC__ ))
/* .xyzw and .s0123...{f|F} are supported */
#define CL_HAS_NAMED_VECTOR_FIELDS 1
/* .hi and .lo are supported */
#define CL_HAS_HI_LO_VECTOR_FIELDS 1
#define CL_NAMED_STRUCT_SUPPORTED
-#endif
+//#endif
#if defined( CL_NAMED_STRUCT_SUPPORTED) && defined( _MSC_VER )
#define __extension__ __pragma(warning(suppress:4201))
More information about the Bf-blender-cvs
mailing list