Skip to content

Commit 4f15a6a

Browse files
bradkingbradking
committed
Tests: Revert "require C++14 for the Tutorial"
Revert commit a2a90f4 (Tests: require C++14 for the Tutorial, 2019-03-21, v3.15.0-rc1~41^2~2). In commit d50b31b (Clang: For MSVC ABI do not use modes older than C++14, 2019-07-23) we fixed the C++ standard selection for GNU-like Clang with the MSVC ABI so the test code itself no longer needs to do it. In particular, changing the tests in this way broke the tutorial's narrative.
1 parent d50b31b commit 4f15a6a

File tree

13 files changed

+27
-13
lines changed

13 files changed

+27
-13
lines changed

‎Tests/Tutorial/Complete/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
77
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
88
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
99

10-
set(CMAKE_CXX_STANDARD 14)
10+
set(CMAKE_CXX_STANDARD 11)
11+
set(CMAKE_CXX_STANDARD_REQUIRED True)
1112

1213
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
1314

‎Tests/Tutorial/Consumer/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22

33
if(NOT DEFINED CMAKE_CXX_STANDARD)
4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56
endif()
67

78

‎Tests/Tutorial/Step10/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
77
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
88
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
99

10-
set(CMAKE_CXX_STANDARD 14)
10+
set(CMAKE_CXX_STANDARD 11)
11+
set(CMAKE_CXX_STANDARD_REQUIRED True)
1112

1213
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
1314

‎Tests/Tutorial/Step11/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
77
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
88
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
99

10-
set(CMAKE_CXX_STANDARD 14)
10+
set(CMAKE_CXX_STANDARD 11)
11+
set(CMAKE_CXX_STANDARD_REQUIRED True)
1112

1213
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
1314

‎Tests/Tutorial/Step2/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
6+
57
# the version number.
68
set(Tutorial_VERSION_MAJOR 1)
79
set(Tutorial_VERSION_MINOR 0)

‎Tests/Tutorial/Step2/directions.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ the following:
4444
cmake_minimum_required(VERSION 3.3)
4545
project(Tutorial)
4646

47-
set(CMAKE_CXX_STANDARD 14)
47+
set(CMAKE_CXX_STANDARD 11)
48+
set(CMAKE_CXX_STANDARD_REQUIRED True)
4849

4950
# the version number.
5051
set(Tutorial_VERSION_MAJOR 1)

‎Tests/Tutorial/Step3/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# should we use our own math functions
78
option(USE_MYMATH "Use tutorial provided math implementation" ON)

‎Tests/Tutorial/Step4/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# should we use our own math functions
78
option(USE_MYMATH "Use tutorial provided math implementation" ON)

‎Tests/Tutorial/Step5/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# should we use our own math functions
78
option(USE_MYMATH "Use tutorial provided math implementation" ON)

‎Tests/Tutorial/Step6/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# the version number.
78
set(Tutorial_VERSION_MAJOR 1)

‎Tests/Tutorial/Step7/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# the version number.
78
set(Tutorial_VERSION_MAJOR 1)

‎Tests/Tutorial/Step8/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# the version number.
78
set(Tutorial_VERSION_MAJOR 1)

‎Tests/Tutorial/Step9/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.3)
22
project(Tutorial)
33

4-
set(CMAKE_CXX_STANDARD 14)
4+
set(CMAKE_CXX_STANDARD 11)
5+
set(CMAKE_CXX_STANDARD_REQUIRED True)
56

67
# the version number.
78
set(Tutorial_VERSION_MAJOR 1)

0 commit comments

Comments
 (0)