Skip to content

Commit

Permalink
Switch from C++14 to C++17
Browse files Browse the repository at this point in the history
  • Loading branch information
uklotzde committed Jan 14, 2020
1 parent 1b24796 commit 24affc9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)

# Speed up builds on HDDs
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # GNU is GNU GCC
Expand Down
6 changes: 3 additions & 3 deletions build/depends.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,13 +439,13 @@ def configure(self, build, conf):
build.env.Append(LINKFLAGS=['-Wl,-rpath,%s' % libdir_path])
build.env.Append(LINKFLAGS="-L" + libdir_path)

# Mixxx requires C++14 support
# Mixxx requires C++17 support
if build.platform_is_windows:
# MSVC
build.env.Append(CXXFLAGS='/std:c++14')
build.env.Append(CXXFLAGS='/std:c++17')
else:
# GCC/Clang
build.env.Append(CXXFLAGS='-std=c++14')
build.env.Append(CXXFLAGS='-std=c++17')


class TestHeaders(Dependence):
Expand Down

0 comments on commit 24affc9

Please sign in to comment.