diff options
author | Mathias Preiner <mathias.preiner@gmail.com> | 2019-03-12 20:09:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-12 20:09:35 -0700 |
commit | 1b8ee921760d15492c0c0492ce6a4da07186699a (patch) | |
tree | d22810e876b2d9e8a68919ff3ff3b950c5525bf6 /.travis.yml | |
parent | 093d5ffdfa5c1656309da6b9cbdfbbf28574a8a0 (diff) |
Fix public headers for make install. (#2856)
This commit fixes make install, which previously copied all public header files to ${CMAKE_INSTALL_PREFIX}/ instead of ${CMAKE_INSTALL_PREFIX}/cvc4.
Further, the old build system modified all #include directives in the installed public header files to use the installed headers, e.g., #include "cvc4_public.h" was changed to #include <cvc4/cvc4_public.h>. Now, after make install the script src/fix-install-headers.sh is executed to change the #include directives accordingly (this should be obsolete with the new C++ API).
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 265f42bb4..61a40a9f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ script: normal="$(echo -e '\033[0m')" red="$normal$(echo -e '\033[01;31m')" green="$normal$(echo -e '\033[01;32m')" configureCVC4() { echo "CVC4 config - $TRAVIS_CVC4_CONFIG"; - ./configure.sh --name=build --unit-testing $TRAVIS_CVC4_CONFIG + ./configure.sh --name=build --prefix=$(pwd)/build/install --unit-testing $TRAVIS_CVC4_CONFIG } error() { echo; @@ -69,6 +69,12 @@ script: make -j2 check ARGS='-LE regress[1-4]' CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/UNIT/SYSTEM/REGRESSION TEST FAILED" ctest -j2 -L example || error "RUNNING EXAMPLES FAILED" } + makeInstallCheck() { + cd build + make install -j2 + echo -e "#include <cvc4/cvc4.h>\nint main() { CVC4::ExprManager em; return 0; }" > /tmp/test.cpp + $CXX -std=c++11 /tmp/test.cpp -I install/include -L install/lib -lcvc4 -lcln || exit 1 + } run() { echo "travis_fold:start:$1" echo "Running $1" @@ -77,7 +83,7 @@ script: } [ -n "$TRAVIS_CVC4" ] && [ -n "$TRAVIS_WITH_LFSC" ] && run contrib/get-lfsc-checker [ -n "$TRAVIS_CVC4" ] && run configureCVC4 - [ -n "$TRAVIS_CVC4" ] && run makeCheck + [ -n "$TRAVIS_CVC4" ] && run makeCheck && run makeInstallCheck [ -z "$TRAVIS_CVC4" ] && error "Unknown Travis-CI configuration" echo "travis_fold:end:load_script" - echo; echo "${green}EVERYTHING SEEMED TO PASS!${normal}" |