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...
This commit is contained in:
parent
127c44dafe
commit
d3a46cc9d4
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user