From 08bd745c424f7583a0bd7d0af2384b392f39dda9 Mon Sep 17 00:00:00 2001 From: xboi209 Date: Tue, 22 Sep 2015 09:31:59 -0700 Subject: [PATCH] - Force Travis to use CMake 3.3.2 - Force appveyor to use Visual Studio 2015 --- .travis.yml | 4 ++-- appveyor.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c8a3af..e964573 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ compiler: gcc before_install: - sudo apt-get update --fix-missing - sudo apt-get install build-essential zlib1g-dev libmysqlclient-dev liblua5.1-0-dev - - (cd /tmp && wget http://www.cmake.org/files/v3.1/cmake-3.1.3.tar.gz && tar zxf cmake-3.1.3.tar.gz) - - (cd /tmp/cmake-3.1.3 && cmake . && make && sudo make install) > /dev/null 2>&1 + - (cd /tmp && wget http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz && tar zxf cmake-3.3.2.tar.gz) + - (cd /tmp/cmake-3.3.2 && cmake . && make && sudo make install) > /dev/null 2>&1 - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get -qq update - sudo apt-get -qq install g++-5 diff --git a/appveyor.yml b/appveyor.yml index e3d1564..43e9d17 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ build: build_script: - cmd: cd c:\builder\ - cmd: build_pvpgn.bat cmake_only 6 2 1 y - - cmd: call "%VS120COMNTOOLS%vsvars32.bat" + - cmd: call "%VS140COMNTOOLS%vsvars32.bat" - cmd: set INCLUDE=c:\builder\module\include\atlmfc\;%INCLUDE% - cmd: call "%FrameworkDir%%FrameworkVersion%\MSBuild.exe" c:\builder\build\pvpgn.sln /t:Rebuild /p:Configuration=Release;UseEnv=true /consoleloggerparameters:Summary;PerformanceSummary;Verbosity=minimal /maxcpucount