Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc70cc30

Browse files
committed
fixup: workaround CC and CXX shadowing
1 parent24b38e7 commitc70cc30

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

‎.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ cache:
1212
matrix:
1313
include:
1414
# GCC configurations
15-
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
15+
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
1616
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
17-
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
17+
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
1818
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
19-
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
19+
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
2020
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
21-
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
21+
-env:BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
2222
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
23-
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
23+
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
2424
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
25-
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
25+
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
2626
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
27-
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
27+
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
2828
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
29-
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBCXX=YESCC=gcc-4.9CXX=g++-4.9
29+
-env:BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF" Uri_BUILD_TESTS=OFFUri_DISABLE_LIBNEWCXX=YESNEWCC=gcc-4.9NEWCXX=g++-4.9
3030
addons:{ apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-4.9", "libboost1.55-all-dev"] } }
3131

3232
install:
33-
-if [[ "${CXX}" != "" ]]; then export CXX=${CXX}; fi
34-
-if [[ "${CC}" != "" ]]; then export CC=${CC}; fi
33+
-if [[ "${CXX}" != "" ]]; then export CXX=${NEWCXX}; fi
34+
-if [[ "${CC}" != "" ]]; then export CC=${NEWCC}; fi
3535
-"${CXX} --version"
3636
-"${CC} --version"
3737
-pwd

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp