Skip to content

Commit 1d158ca

Browse files
committed
Removed checks for c++0x as they are no longer used.
1 parent c246806 commit 1d158ca

File tree

6 files changed

+6
-30
lines changed

6 files changed

+6
-30
lines changed

CMakeLists.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,11 @@ endif()
4343

4444
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
4545
INCLUDE(CheckCXXCompilerFlag)
46-
CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD0X)
4746
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
4847
if (HAVE_STD11)
4948
set(CMAKE_CXX_FLAGS -std=c++11)
50-
elseif (HAVE_STD0X)
51-
set(CMAKE_CXX_FLAGS -std=c++0x)
5249
else()
53-
message(FATAL_ERROR "No advanced standard C++ support (-std=c++0x and -std=c++11 not defined).")
50+
message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
5451
endif()
5552
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
5653
INCLUDE(CheckCXXCompilerFlag)

concurrency/src/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
77

88
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
9-
if (HAVE_STD11)
10-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
11-
elseif (HAVE_STD0X)
12-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
13-
endif()
9+
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
1410
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
1511
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
1612
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")

concurrency/test/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
77

88
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
9-
if (HAVE_STD11)
10-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
11-
elseif (HAVE_STD0X)
12-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
13-
endif()
9+
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
1410
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
1511
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
1612
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")

logging/src/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
# http://www.boost.org/LICENSE_1_0.txt)
55

66
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
7-
if (HAVE_STD11)
8-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
9-
elseif (HAVE_STD0X)
10-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
11-
endif()
7+
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
128
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
139
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
1410
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")

message/src/CMakeLists.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
# http://www.boost.org/LICENSE_1_0.txt)
55

66
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
7-
if (HAVE_STD11)
8-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
9-
elseif (HAVE_STD0X)
10-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
11-
endif()
7+
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
128
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
139
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
1410
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
@@ -54,4 +50,3 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
5450
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
5551
endif()
5652
endforeach(src_file)
57-

uri/src/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
# http://www.boost.org/LICENSE_1_0.txt)
55

66
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
7-
if (HAVE_STD11)
8-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
9-
elseif (HAVE_STD0X)
10-
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
11-
endif()
7+
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
128
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
139
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
1410
set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")

0 commit comments

Comments
 (0)