Преглед изворни кода

Merge pull request #1640 from lioncash/cpp14

CMakeFiles: Compile as C++14
Yuri Kunde Schlesner пре 10 година
родитељ
комит
e3905cdfd8
4 измењених фајлова са 7 додато и 7 уклоњено
  1. 2 2
      .travis-build.sh
  2. 2 2
      .travis-deps.sh
  3. 2 2
      .travis.yml
  4. 1 1
      CMakeLists.txt

+ 2 - 2
.travis-build.sh

@@ -11,8 +11,8 @@ fi
 
 #if OS is linux or is not set
 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-4.9
-    export CXX=g++-4.9
+    export CC=gcc-5
+    export CXX=g++-5
     export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
 
     mkdir build && cd build

+ 2 - 2
.travis-deps.sh

@@ -5,8 +5,8 @@ set -x
 
 #if OS is linux or is not set
 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-4.9
-    export CXX=g++-4.9
+    export CC=gcc-5
+    export CXX=g++-5
     mkdir -p $HOME/.local
 
     curl -L http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \

+ 2 - 2
.travis.yml

@@ -15,8 +15,8 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gcc-4.9
-      - g++-4.9
+      - gcc-5
+      - g++-5
       - xorg-dev
       - lib32stdc++6 # For CMake
       - lftp # To upload builds

+ 1 - 1
CMakeLists.txt

@@ -65,7 +65,7 @@ endif()
 message(STATUS "Target architecture: ${ARCHITECTURE}")
 
 if (NOT MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes -pthread")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes -pthread")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
 
     if (ARCHITECTURE_x86_64)