@@ -82,8 +82,8 @@ if [ "$TRAVIS_OS_NAME" = osx ]; then
82
82
[ " $CODECOV " != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently LCOV_INSTALL_PID locked brew install lcov
83
83
[ " $FORMAT_CHECK " = 0 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently FORMAT_INSTALL_PID locked brew install prettier clang-format
84
84
elif [ " $TRAVIS_OS_NAME " = windows ]; then
85
- folded ... concurrently MAKE_INSTALL_PID choco install make
86
- folded ... concurrently VC2019_INSTALL_PID ignore choco install visualstudio2019-workload-vctools
85
+ [ " $GCC " = 0 ] || folded ... concurrently MAKE_INSTALL_PID choco install make
86
+ [ " $VS2019 " = 0 ] || folded ... concurrently VC2019_INSTALL_PID ignore choco install visualstudio2019-workload-vctools
87
87
fi
88
88
89
89
export CMAKE_HELP
95
95
96
96
folded-finish GIT_UPDATE_PID
97
97
98
- if [ " $TRAVIS_OS_NAME " = osx ]; then
98
+ if [ " $TRAVIS_OS_NAME " = osx ] && [ " $GCC " != 0 ] ; then
99
99
for (( i= 8 ; i< 20 ; ++ i)) ; do
100
100
if command -v " gcc-$i " > /dev/null ; then
101
101
GCC_VERSION=" $i "
106
106
run-tests () {
107
107
for CONFIG in Debug Release; do
108
108
if [ " $TRAVIS_OS_NAME " = linux ]; then
109
- CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded " Clang $CONFIG " cppsm test
110
- CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded " GCC $CONFIG " cppsm test
109
+ [ " $CLANG " = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded " Clang $CONFIG " cppsm test
110
+ [ " $GCC " = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded " GCC $CONFIG " cppsm test
111
111
elif [ " $TRAVIS_OS_NAME " = windows ]; then
112
- CMAKE_BUILD_TYPE=$CONFIG CC=' ' CXX=' ' CMAKE_GENERATOR=" Visual Studio 15 2017" folded " VC2017 $CONFIG " cppsm test
113
- folded-finish MAKE_INSTALL_PID
114
- CMAKE_BUILD_TYPE=$CONFIG CC=" gcc" CXX=" g++" folded " GCC $CONFIG " cppsm test
112
+ [ " $VS2017 " = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=' ' CXX=' ' CMAKE_GENERATOR=" Visual Studio 15 2017" folded " VC2017 $CONFIG " cppsm test
113
+ [ " $GCC " = 0 ] || folded-finish MAKE_INSTALL_PID
114
+ [ " $GCC " = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=" gcc" CXX=" g++" folded " GCC $CONFIG " cppsm test
115
115
elif [ " $TRAVIS_OS_NAME " = osx ]; then
116
- CMAKE_BUILD_TYPE=$CONFIG CC=' ' CXX=' ' CMAKE_GENERATOR=Xcode folded " Clang $CONFIG " cppsm test
117
- [ -z " $GCC_VERSION " ] || CMAKE_BUILD_TYPE=$CONFIG CC=gcc-$GCC_VERSION CXX=g++-$GCC_VERSION folded " GCC $CONFIG " cppsm test
116
+ [ " $CLANG " = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=' ' CXX=' ' CMAKE_GENERATOR=Xcode folded " Clang $CONFIG " cppsm test
117
+ [ " $GCC " = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=gcc-$GCC_VERSION CXX=g++-$GCC_VERSION folded " GCC $CONFIG " cppsm test
118
118
else
119
119
echo " Unsupported OS: $TRAVIS_OS_NAME "
120
120
exit 1
121
121
fi
122
122
done
123
123
124
- if [ " $TRAVIS_OS_NAME " = windows ]; then
124
+ if [ " $TRAVIS_OS_NAME " = windows ] && [ " $VS2019 " != 0 ] ; then
125
125
folded-finish VC2019_INSTALL_PID
126
126
127
127
for CONFIG in Debug Release; do
0 commit comments