From 06d02479aeda70ebb09f96a08a19dbdbe7b3a38a Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 12 Feb 2019 22:54:43 +0300 Subject: [PATCH] Switch to systemwide installation --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 241e873..25dec59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,19 +42,21 @@ before_install: - export CXXFLAGS="${CXXFLAGS} -Werror" script: - - export PREFIX=`pwd`.prefix - - cmake . -DCMAKE_INSTALL_PREFIX=${PREFIX} -DSDL2PP_WITH_WERROR=YES -DSDL2PP_CXXSTD=${CXXSTD} ${CMAKE_EXTRA_ARGS} - - VERBOSE=1 make && make ARGS=-V test && make install + - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=yes -DSDL2PP_WITH_WERROR=YES -DSDL2PP_CXXSTD=${CXXSTD} ${CMAKE_EXTRA_ARGS} + - make + - ctest -V + - sudo make install + - cppcheck -I . --enable=performance,portability,information,missingInclude --error-exitcode=2 SDL2pp # `style' gives false positive in cppcheck 1.61 which comes with trusty - make doxygen # - "if make doxygen 2>&1 | grep 'warning:'; then echo 'FATAL: doxygen warnings!'; false; fi" - "if git ls-files --others --exclude-standard | grep ''; then echo 'FATAL: incomplete .gitignore'; false; fi" - cat ${TRAVIS_BUILD_DIR}/sdl2pp.pc - - cd ${TRAVIS_BUILD_DIR}/exttests/pkg-config && PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig make + - cd ${TRAVIS_BUILD_DIR}/exttests/pkg-config && make - cat ${TRAVIS_BUILD_DIR}/FindSDL2PP.cmake - - cd ${TRAVIS_BUILD_DIR}/exttests/cmake && cmake -DCMAKE_MODULE_PATH=${PREFIX}/share/cmake/Modules . && make + - cd ${TRAVIS_BUILD_DIR}/exttests/cmake && cmake . && make - cd ${TRAVIS_BUILD_DIR}