aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try fixing appveyor

Browse source 
dropping jom and using plain nmake
This commit is contained in:
Fabio Bas 2015-10-02 18:14:54 +02:00
parent 43262b294d
commit 784148e158
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
appveyor.yml
View file

@ -20,7 +20,6 @@ install:
# upgrade cmake in order to have c++11 support # upgrade cmake in order to have c++11 support
- choco install cmake -y - choco install cmake -y
- choco install nsis -y - choco install nsis -y
- choco install jom -y
- ps: | - ps: |
if (Test-Path c:\protoc) { if (Test-Path c:\protoc) {
echo "using protoc from cache" echo "using protoc from cache"
@ -63,8 +62,8 @@ build_script:
Write-Output "PROTOINC = $protoinc" Write-Output "PROTOINC = $protoinc"
Write-Output "PROTOLIB = $protolib" Write-Output "PROTOLIB = $protolib"
Write-Output "PROTOC = $protoc" Write-Output "PROTOC = $protoc"
cmake .. "-GNMake Makefiles JOM" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver" "-DWITH_SERVER=1" "-DZLIB_INCLUDE_DIR=$zlibinc" "-DZLIB_LIBRARY=$zliblib" "-DPROTOBUF_INCLUDE_DIR=$protoinc" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARY=$protolib" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc" cmake .. "-GNMake Makefiles" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver" "-DWITH_SERVER=1" "-DZLIB_INCLUDE_DIR=$zlibinc" "-DZLIB_LIBRARY=$zliblib" "-DPROTOBUF_INCLUDE_DIR=$protoinc" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARIES=$protolib" "-DPROTOBUF_LIBRARY=$protolib" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc"
- jom package - nmake package
- c:\cygwin\bin\ls -l - c:\cygwin\bin\ls -l
- ps: | - ps: |
$exe = dir -name *.exe $exe = dir -name *.exe