Skip to content

Commit

Permalink
#2045: build: switch everything to C++17 by default
Browse files Browse the repository at this point in the history
  • Loading branch information
lifflander committed Dec 20, 2022
1 parent d755958 commit d21633d
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ standard to use")
set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
endif()
message(STATUS "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}")

Expand Down
2 changes: 1 addition & 1 deletion ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-}" \
-Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \
-Dvt_no_color_enabled="${VT_NO_COLOR_ENABLED:-0}" \
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-14}" \
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
-DBUILD_SHARED_LIBS="${BUILD_SHARED_LIBS:-0}" \
"$VT"
cmake_conf_ret=$?
Expand Down
2 changes: 1 addition & 1 deletion ci/build_vt_sample.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ then
-Dvt_trace_only="1" \
-DVT_BUILD_EXAMPLES="0" \
-DVT_BUILD_TESTS="0" \
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-14}" \
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \
-DCMAKE_CXX_COMPILER="${CXX:-c++}" \
Expand Down
2 changes: 1 addition & 1 deletion cmake/check_compiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function(check_cc_quirk VAR CC_FILE)
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cmake/cc_tests/${CC_FILE}
OUTPUT_VARIABLE check_cc_quirk_output
CXX_STANDARD 14
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS OFF
)
Expand Down
2 changes: 1 addition & 1 deletion cmake/load_bundled_libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
include(SetCXXCompilerFlags)

# Export a minimum version flag for any bundled libraries that don't set their own
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)

# Optionally include libfort which is used by diagnostics
if (vt_libfort_enabled)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ x-vtopts: &vtopts
VT_INCLUSION_TYPE: ${VT_INCLUSION:-TPL}
CODECOV_TOKEN: ${CODECOV_TOKEN:-}
TEST_LB_SCHEMA: ${TEST_LB_SCHEMA:-0}
CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD:-14}
CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD:-17}

services:
##############################################################################
Expand Down

0 comments on commit d21633d

Please sign in to comment.