summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-05-07 08:28:23 (GMT)
committerGitHub <noreply@github.com>2019-05-07 08:28:23 (GMT)
commit9e173b53f464f7db536cae603981bbaa2911765f (patch)
treeeb06225f1bcc1a1e5a0026356fa27f6fb7649fa3
parentc637dede9ec30c2e35f19636edc0b3fd424b45e5 (diff)
parent789828a0689edccb89f02233a445a7aa1e86b1da (diff)
downloadDoxygen-9e173b53f464f7db536cae603981bbaa2911765f.zip
Doxygen-9e173b53f464f7db536cae603981bbaa2911765f.tar.gz
Doxygen-9e173b53f464f7db536cae603981bbaa2911765f.tar.bz2
Merge pull request #6966 from albert-github/feature/bug_travis_linux_cmake
Travis build fails due to problem with cmake
-rw-r--r--.travis.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index e6b10c1..8b84cbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,9 +56,7 @@ before_script:
if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ ! "${OS_NAME}" == "linux-ppc64le" ]; then
printf "[requires]
libxml2/2.9.8@bincrafters/stable
- libiconv/1.15@bincrafters/stable
- [build_requires]
- cmake_installer/3.10.0@conan/stable" >> conanfile.txt;
+ libiconv/1.15@bincrafters/stable" >> conanfile.txt;
fi;
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
printf "[requires]