[build] test again with c++11 support

mydeveloperday · mydeveloperday · commit 8daa200ee6d6 · 2016-02-21T22:45:58.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,16 +17,20 @@ if(${CMAKE_COMPILER_ID} MATCHES GNU AND $cpp-netframework)
     set_target_properties(StringTest PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -gp -fprofile-coverage -fprofile-args" LINK_FLAGS "-fprofile-arcs")
 endif()
 
-#include(CheckCXXCompilerFlag)
-#CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-#CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-#if(COMPILER_SUPPORTS_CXX11)
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-#elseif(COMPILER_SUPPORTS_CXX0X)
-#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-#else()
-    #message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-#endif()
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+if(COMPILER_SUPPORTS_CXX11)
+   #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_LANG_CXX11")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSUPPORTS_CXX_11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_LANG_CXX11")
+else()
+    message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+endif()
 
 ENABLE_TESTING()
 INCLUDE(CTest)
diff --git a/src/framework/System.Compiler.h b/src/framework/System.Compiler.h
@@ -4,9 +4,6 @@
 #include "System.h"
 #include "OS.h"
 
-// when C++ 11 override this with 'override'
-#define OVERRIDE
-
 namespace System
 {
     namespace Compiler

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@`
`4`	`4`	`#include "System.h"`
`5`	`5`	`#include "OS.h"`
`6`	`6`
`7`		`-// when C++ 11 override this with 'override'`
`8`		`-#define OVERRIDE`
`9`		`-`
`10`	`7`	`namespace System`
`11`	`8`	`{`
`12`	`9`	`namespace Compiler`