File tree 6 files changed +6
-30
lines changed
6 files changed +6
-30
lines changed Original file line number Diff line number Diff line change @@ -43,14 +43,11 @@ endif()
43
43
44
44
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
45
45
INCLUDE (CheckCXXCompilerFlag)
46
- CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD0X)
47
46
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
48
47
if (HAVE_STD11)
49
48
set (CMAKE_CXX_FLAGS -std=c++11)
50
- elseif (HAVE_STD0X)
51
- set (CMAKE_CXX_FLAGS -std=c++0x)
52
49
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)." )
54
51
endif ()
55
52
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
56
53
INCLUDE (CheckCXXCompilerFlag)
Original file line number Diff line number Diff line change 6
6
include_directories (${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
7
7
8
8
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" )
14
10
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
15
11
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
16
12
set (CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++" )
Original file line number Diff line number Diff line change 6
6
include_directories (${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
7
7
8
8
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" )
14
10
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
15
11
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
16
12
set (CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++" )
Original file line number Diff line number Diff line change 4
4
# http://www.boost.org/LICENSE_1_0.txt)
5
5
6
6
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" )
12
8
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
13
9
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
14
10
set (CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++" )
Original file line number Diff line number Diff line change 4
4
# http://www.boost.org/LICENSE_1_0.txt)
5
5
6
6
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" )
12
8
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
13
9
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
14
10
set (CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++" )
@@ -54,4 +50,3 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
54
50
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
55
51
endif ()
56
52
endforeach (src_file)
57
-
Original file line number Diff line number Diff line change 4
4
# http://www.boost.org/LICENSE_1_0.txt)
5
5
6
6
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" )
12
8
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
13
9
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
14
10
set (CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++" )
You can’t perform that action at this time.
0 commit comments