UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Travis CI: s/make/cmake --build/ for msvc compatibility

Browse source 
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...
This commit is contained in:
Ahmad Fatoum 2019-01-06 19:50:35 +01:00
parent 127c44dafe
commit d3a46cc9d4
No known key found for this signature in database
GPG key ID: C3EAC3DE9321D59B
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -128,10 +128,11 @@ script:
-DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW -DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW
-DUSE_WAYLAND=$WAYLAND -DUSE_WAYLAND=$WAYLAND
-DINCLUDE_EVERYTHING=ON -DINCLUDE_EVERYTHING=ON
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
.. ..
- $RUNNER make VERBOSE=1 - $RUNNER cmake --build . --target
- if [ "$RELEASE" != "NO" ]; then $RUNNER make package; fi - if [ "$RELEASE" != "NO" ]; then $RUNNER cmake --build . --target package; fi
- sudo $RUNNER make install - $RUNNER $(which sudo) "$(which cmake)" --build . --target install
- if [ ! "$DONT_TEST" ]; then - if [ ! "$DONT_TEST" ]; then
pkg-config --static --libs raylib; pkg-config --static --libs raylib;
nm -g release/libraylib.a | grep glfwGetProcAddress || (echo "libraylib.a doesn't contain GLFW symbols! Aborting..." && false); nm -g release/libraylib.a | grep glfwGetProcAddress || (echo "libraylib.a doesn't contain GLFW symbols! Aborting..." && false);