diff options
| author | Francesco Borzì <borzifrancesco@gmail.com> | 2019-03-21 09:14:07 +0100 |
|---|---|---|
| committer | Viste(Кирилл) <viste02@gmail.com> | 2019-03-21 11:14:07 +0300 |
| commit | c4835d80995f7f7f6a2cc179f1f244fe08eabb0a (patch) | |
| tree | 20b455e0536e542354a293047549d5b893f7f8ff /src/cmake/compiler | |
| parent | 6fd03cfd0500c39a728984e79f6973fbf35c2075 (diff) | |
Switch to C++14 to solve compilation issues (#1595)
Diffstat (limited to 'src/cmake/compiler')
| -rw-r--r-- | src/cmake/compiler/clang/settings.cmake | 2 | ||||
| -rw-r--r-- | src/cmake/compiler/gcc/settings.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cmake/compiler/clang/settings.cmake b/src/cmake/compiler/clang/settings.cmake index 41c369f0b1..429b8d634b 100644 --- a/src/cmake/compiler/clang/settings.cmake +++ b/src/cmake/compiler/clang/settings.cmake @@ -16,5 +16,5 @@ endif() # -Wno-narrowing needed to suppress a warning in g3d # -Wno-deprecated-register is needed to suppress gsoap warnings on Unix systems. -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z -Wno-narrowing -Wno-deprecated-register") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-narrowing -Wno-deprecated-register") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1") diff --git a/src/cmake/compiler/gcc/settings.cmake b/src/cmake/compiler/gcc/settings.cmake index e1aa7ab97e..18bc452bdc 100644 --- a/src/cmake/compiler/gcc/settings.cmake +++ b/src/cmake/compiler/gcc/settings.cmake @@ -7,8 +7,8 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) message(FATAL_ERROR "GCC: This project requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z") -message(STATUS "GCC: Enabled c++17 support") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") +message(STATUS "GCC: Enabled c++14 support") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") message(STATUS "GCC: Enabled C99 support") |