Peter M. Groen / openhantek

Commit 6fb6fbe5d3bd058f33f7b6f01aa2eefa535d946c

Authored by viktorxda
Committed by David Gräff
1 parent b6afff00

update appveyor.yml (#266) 

update appveyor.yml
Inline Side-by-side
Showing 2 changed files with 9 additions and 32 deletions
appveyor.yml
  View file @6fb6fbe
... ... @@ -7,47 +7,24 @@ configuration:
7 7 matrix:
8 8 fast_finish: true
9 9  
10   -clone_folder: C:\projects\openhantek
11   -
12   -install:
13   -# - cinst cmake
14   -
15 10 image:
16 11 - Visual Studio 2015
17 12  
18 13 shallow_clone: true
19 14  
20 15 before_build:
21   - - if [%PLATFORM%] == [x64] set QT5=C:\Qt\5.8\msvc2015_64
22   - - if [%PLATFORM%] == [x64] set VSARCH=x86
23   - - if [%PLATFORM%] == [x64] set "CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64"
24   - - if [%PLATFORM%] == [Win32] set QT5=C:\Qt\5.8\msvc2015
25   - - if [%PLATFORM%] == [Win32] set VSARCH=x64
26   - - if [%PLATFORM%] == [Win32] set "CMAKE_GENERATOR_NAME=Visual Studio 14 2015"
  16 + - set QT5=C:\Qt\5.11\msvc2015_64
  17 + - set "CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64"
27 18 - set Path=%QT5%\bin;%Path%
28 19 - md build
29 20 - cd build
30   - - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VSARCH%
  21 + - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform%
31 22 - cmake.exe -G "%CMAKE_GENERATOR_NAME%" "-DCMAKE_PREFIX_PATH=%QT5%" -DCMAKE_BUILD_TYPE=%configuration% ..
32   -
33   -build:
34 23  
35 24 build_script:
36   - - cmake --build . --config Release --target package
37   -
38   -# User "ci-openhantek". Uses a appveyor encrypted github access token for that user.
39   -deploy:
40   - - provider: GitHub
41   - artifact: /packages\\*\.exe/
42   - draft: false
43   - prerelease: false
44   - force_update: true
45   - auth_token:
46   - secure: KD4fRkMn+nap8Uw/8SDyAgqYREMPYkF+AOdl6e130Ha95lEAyCyLsKuIfFWsLy4c
47   - on:
48   - branch: master # release from master branch only
49   - appveyor_repo_tag: true # deploy on tag push only
  25 + - cmake --build . --config %configuration% --target package
50 26  
51   -notifications:
52   - - provider: Email
53   - on_build_status_changed: true
  27 +artifacts:
  28 + - path: build\openhantek\$(configuration)
  29 + name: OpenHantek-$(platform)-$(configuration)-b$(APPVEYOR_BUILD_NUMBER)
  30 + type: zip
... ...
cmake/copy_qt5_dlls_to_bin_dir.cmake
  View file @6fb6fbe
... ... @@ -9,7 +9,7 @@ if (MSVC)
9 9 add_custom_command(TARGET ${PROJECT_NAME}
10 10 POST_BUILD
11 11 COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
12   - COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.exe"
  12 + COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/${PROJECT_NAME}.exe"
13 13 WORKING_DIRECTORY "${QT5_BIN_DIR}"
14 14 COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"
15 15 )
... ...