Commit: 2c17a5726140907da6728b417dfa6f1db4deb303
Author: Sergey Sharybin
Date: Mon Nov 17 13:50:01 2014 +0100
Branches: depsgraph_refactor
https://developer.blender.org/rB2c17a5726140907da6728b417dfa6f1db4deb303
Merge branch 'master' into depsgraph_refactor
Conflicts:
CMakeLists.txt
===================================================================
===================================================================
diff --cc CMakeLists.txt
index c300fa9,924684c..971448c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -2546,20 -2599,6 +2599,13 @@@ if(WITH_PYTHON
endif()
endif()
- if(WITH_GCC_MUDFLAP)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fmudflapth -funwind-tables")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpthread
-lmudflapth -rdynamic")
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_MUDFLAP
-Wno-error=mudflap)
- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_ERROR_MUDFLAP
-Wno-error=mudflap)
- endif()
-
+# Enable C++11
+if(CMAKE_COMPILER_IS_GNUCC)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -U__STRICT_ANSI__")
+elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -U__STRICT_ANSI__")
+endif()
+
# Include warnings first, so its possible to disable them with user defined
flags
# eg: -Wno-uninitialized
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
