From d3a46cc9d447b161f52e63ab81a7f10841792a0e Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sun, 6 Jan 2019 19:50:35 +0100 Subject: [PATCH] Travis CI: s/make/cmake --build/ for msvc compatibility CMake defaults to generating a Visual Studio build on Windows, which doesn't involve make. Thus use cmake --build to abstract that detail away. We already do that in the appveyor.yml. The install line is a bit hacky: cmake might not be in the search path when using sudo, thus use "$(which cmake)" to get the path, sudo doesn't seem to be available on the Travis CI windows environment, so use $(which sudo) without quotes to expand to nothing if that's the case... --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b75e19fd..12f7ac27f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,10 +128,11 @@ script: -DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW -DUSE_WAYLAND=$WAYLAND -DINCLUDE_EVERYTHING=ON + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. - - $RUNNER make VERBOSE=1 - - if [ "$RELEASE" != "NO" ]; then $RUNNER make package; fi - - sudo $RUNNER make install + - $RUNNER cmake --build . --target + - if [ "$RELEASE" != "NO" ]; then $RUNNER cmake --build . --target package; fi + - $RUNNER $(which sudo) "$(which cmake)" --build . --target install - if [ ! "$DONT_TEST" ]; then pkg-config --static --libs raylib; nm -g release/libraylib.a | grep glfwGetProcAddress || (echo "libraylib.a doesn't contain GLFW symbols! Aborting..." && false);