File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3030
3131# CMake-generated files:
3232CMakeFiles/
33- CTestTestFile.cmake
34- cmake_install.cmake
33+ *.cmake
3534pkg-config/jsoncpp.pc
3635jsoncpp_lib_static.dir/
3736
@@ -45,6 +44,7 @@ jsoncpp_lib_static.dir/
4544/src/lib_json/Makefile
4645/src/test_lib_json/Makefile
4746/src/test_lib_json/jsoncpp_test
47+ *.a
4848
4949# eclipse project files
5050.project
Original file line number Diff line number Diff line change 99install:
1010# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
1111- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
12- # /usr/bin/clang is our version already, and clang-X.Y does not exist .
13- # - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7 " CC="clang-3.7 "; fi
12+ # /usr/bin/clang has a conflict with gcc, so use clang-X.Y.
13+ - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5 " CC="clang-3.5 "; fi
1414- echo ${PATH}
1515- ls /usr/local
1616- ls /usr/local/bin
@@ -22,10 +22,11 @@ addons:
2222 apt:
2323 sources:
2424 - ubuntu-toolchain-r-test
25+ - llvm-toolchain-precise-3.5
2526 packages:
2627 - gcc-4.9
2728 - g++-4.9
28- - clang
29+ - clang-3.5
2930 - valgrind
3031os:
3132 - linux
You can’t perform that action at this time.
0 commit comments