Merge branch 'Remove_cpp98' into 'master'
Remove cpp98 See merge request !125
This commit is contained in:
@@ -8,13 +8,13 @@ clang-c++11:
|
||||
tags:
|
||||
- Linux
|
||||
|
||||
gcc-c++98:
|
||||
script: "CI/ci-linux.sh gcc C++98"
|
||||
gcc-c++14:
|
||||
script: "CI/ci-linux.sh gcc C++14"
|
||||
tags:
|
||||
- Linux
|
||||
|
||||
clang-c++98:
|
||||
script: "CI/ci-linux.sh clang C++98"
|
||||
clang-c++14:
|
||||
script: "CI/ci-linux.sh clang C++14"
|
||||
tags:
|
||||
- Linux
|
||||
|
||||
@@ -28,13 +28,13 @@ macos-c++11:
|
||||
- build-release-cpp11/*.tar.gz
|
||||
|
||||
macos-c++98:
|
||||
script: "CI/ci-mac.sh C++98"
|
||||
script: "CI/ci-mac.sh C++14"
|
||||
tags:
|
||||
- Apple
|
||||
artifacts:
|
||||
paths:
|
||||
- build-release-cpp98/*.dmg
|
||||
- build-release-cpp98/*.tar.gz
|
||||
- build-release-cpp14/*.dmg
|
||||
- build-release-cpp14/*.tar.gz
|
||||
|
||||
cppcheck:
|
||||
script: "CI/ci-cppcheck.sh"
|
||||
|
||||
@@ -33,6 +33,10 @@ elif [ "$LANGUAGE" == "C++11" ]; then
|
||||
echo "Building with C++11";
|
||||
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
|
||||
BUILDPATH="$BUILDPATH-cpp11"
|
||||
elif [ "$LANGUAGE" == "C++14" ]; then
|
||||
echo "Building with C++14";
|
||||
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++14' "
|
||||
BUILDPATH="$BUILDPATH-cpp14"
|
||||
fi
|
||||
|
||||
#=====================================
|
||||
|
||||
@@ -18,6 +18,10 @@ elif [ "$LANGUAGE" == "C++11" ]; then
|
||||
echo "Building with C++11";
|
||||
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
|
||||
BUILDPATH="cpp11"
|
||||
elif [ "$LANGUAGE" == "C++14" ]; then
|
||||
echo "Building with C++14";
|
||||
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++14' "
|
||||
BUILDPATH="cpp14"
|
||||
fi
|
||||
|
||||
#=====================================
|
||||
|
||||
Reference in New Issue
Block a user