Removed checks for c++0x as they are no longer used.

glynos · glynos · commit 1d158ca13556 · 2012-12-29T10:05:00.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,14 +43,11 @@ endif()
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   INCLUDE(CheckCXXCompilerFlag)
-  CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD0X)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   if (HAVE_STD11)
     set(CMAKE_CXX_FLAGS -std=c++11)
-  elseif (HAVE_STD0X)
-    set(CMAKE_CXX_FLAGS -std=c++0x)
   else()
-    message(FATAL_ERROR "No advanced standard C++ support (-std=c++0x and -std=c++11 not defined).")
+    message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
   endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   INCLUDE(CheckCXXCompilerFlag)
diff --git a/concurrency/src/CMakeLists.txt b/concurrency/src/CMakeLists.txt
@@ -6,11 +6,7 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-  if (HAVE_STD11)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-  elseif (HAVE_STD0X)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
-  endif()
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
diff --git a/concurrency/test/CMakeLists.txt b/concurrency/test/CMakeLists.txt
@@ -6,11 +6,7 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-  if (HAVE_STD11)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-  elseif (HAVE_STD0X)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
-  endif()
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
diff --git a/logging/src/CMakeLists.txt b/logging/src/CMakeLists.txt
@@ -4,11 +4,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-  if (HAVE_STD11)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-  elseif (HAVE_STD0X)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
-  endif()
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
diff --git a/message/src/CMakeLists.txt b/message/src/CMakeLists.txt
@@ -4,11 +4,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-  if (HAVE_STD11)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-  elseif (HAVE_STD0X)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
-  endif()
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
@@ -54,4 +50,3 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
         PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 endif()
 endforeach(src_file)
-
diff --git a/uri/src/CMakeLists.txt b/uri/src/CMakeLists.txt
@@ -4,11 +4,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
-  if (HAVE_STD11)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
-  elseif (HAVE_STD0X)
-    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
-  endif()
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
   set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
