fix
This commit is contained in:
parent
a117e46a8a
commit
3e6ca13334
|
@ -4,7 +4,7 @@ branches:
|
||||||
- master
|
- master
|
||||||
build_script:
|
build_script:
|
||||||
- ps: >-
|
- ps: >-
|
||||||
& "$env:APPVEYOR_BUILD_FOLDER\ci\msvc.ps1"
|
& "$env:APPVEYOR_BUILD_FOLDER\ci\appveyor.ps1"
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
- work\git -> appveyor.yml
|
- work\git -> appveyor.yml
|
||||||
|
|
|
@ -16,37 +16,43 @@ $CMAKE_INSTALL_ROOT=$env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
|
||||||
$CMAKE_INSTALL_ROOT="$CMAKE_INSTALL_ROOT/work/install"
|
$CMAKE_INSTALL_ROOT="$CMAKE_INSTALL_ROOT/work/install"
|
||||||
|
|
||||||
|
|
||||||
mkdir $env:APPVEYOR_BUILD_FOLDER\work\install
|
if ( $env:COMPILER -eq "MINGW" )
|
||||||
|
{
|
||||||
|
batCall "C:\Qt\5.5\mingw492_32\bin\qtenv2.bat"
|
||||||
|
#remove sh.exe from path
|
||||||
|
$env:PATH=$env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin", ""
|
||||||
|
$CMAKE_GENERATOR="MinGW Makefiles"
|
||||||
|
$MAKE = "mingw32-make"
|
||||||
|
}
|
||||||
|
elseif ( $env:COMPILER -eq "MSVC" )
|
||||||
|
{
|
||||||
|
batCall "C:\Qt\5.5\msvc2013_64\bin\qtenv2.bat"
|
||||||
|
batCall "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
|
||||||
|
$CMAKE_GENERATOR="NMake Makefiles"
|
||||||
|
$MAKE="nmake"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mkdir $env:APPVEYOR_BUILD_FOLDER\work\build
|
mkdir $env:APPVEYOR_BUILD_FOLDER\work\build
|
||||||
mkdir $env:APPVEYOR_BUILD_FOLDER\work\build\extra-cmake-modules
|
mkdir $env:APPVEYOR_BUILD_FOLDER\work\build\extra-cmake-modules
|
||||||
mkdir $env:APPVEYOR_BUILD_FOLDER\work\build\snorenotify
|
mkdir $env:APPVEYOR_BUILD_FOLDER\work\build\snorenotify
|
||||||
|
|
||||||
|
|
||||||
If ( !(Test-Path "$env:APPVEYOR_BUILD_FOLDER\work\git")){
|
if ( !(Test-Path "$env:APPVEYOR_BUILD_FOLDER\work\install" ) )
|
||||||
|
{
|
||||||
|
mkdir $env:APPVEYOR_BUILD_FOLDER\work\install
|
||||||
mkdir $env:APPVEYOR_BUILD_FOLDER\work\git
|
mkdir $env:APPVEYOR_BUILD_FOLDER\work\git
|
||||||
|
|
||||||
cd $env:APPVEYOR_BUILD_FOLDER\work\git
|
cd $env:APPVEYOR_BUILD_FOLDER\work\git
|
||||||
git clone git://anongit.kde.org/extra-cmake-modules.git
|
git clone git://anongit.kde.org/extra-cmake-modules.git
|
||||||
|
|
||||||
|
cd $env:APPVEYOR_BUILD_FOLDER\work\build\extra-cmake-modules
|
||||||
|
cmake -G $CMAKE_GENERATOR $env:APPVEYOR_BUILD_FOLDER\work\git\extra-cmake-modules -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT"
|
||||||
|
$MAKE install
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if( $env:COMPILER -eq "MINGW" )
|
|
||||||
{
|
|
||||||
batCall "C:\Qt\5.5\mingw492_32\bin\qtenv2.bat"
|
|
||||||
#remove sh.exe from path
|
|
||||||
$env:PATH=$env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin", ""
|
|
||||||
$CMAKE_GENERATOR="MinGW Makefiles"
|
|
||||||
}
|
|
||||||
elseif( $env:COMPILER -eq "MSVC" )
|
|
||||||
{
|
|
||||||
batCall "C:\Qt\5.5\msvc2013_64\bin\qtenv2.bat"
|
|
||||||
batCall "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
|
|
||||||
$CMAKE_GENERATOR="NMake Makefiles"
|
|
||||||
}
|
|
||||||
|
|
||||||
cd $env:APPVEYOR_BUILD_FOLDER\work\build\extra-cmake-modules
|
|
||||||
cmake -G $CMAKE_GENERATOR $env:APPVEYOR_BUILD_FOLDER\work\git\extra-cmake-modules -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT"
|
|
||||||
nmake install
|
|
||||||
|
|
||||||
cd $env:APPVEYOR_BUILD_FOLDER\work\build\snorenotify
|
cd $env:APPVEYOR_BUILD_FOLDER\work\build\snorenotify
|
||||||
cmake -G $CMAKE_GENERATOR $env:APPVEYOR_BUILD_FOLDER -DWITH_SNORE_DAEMON=ON -DWITH_FRONTENDS=ON -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT"
|
cmake -G $CMAKE_GENERATOR $env:APPVEYOR_BUILD_FOLDER -DWITH_SNORE_DAEMON=ON -DWITH_FRONTENDS=ON -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT"
|
||||||
nmake
|
$MAKE
|
Loading…
Reference in New Issue