Skip to content

Commit b2c4ef3

Browse files
committed
cmake update
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent 66ee6e2 commit b2c4ef3

File tree

2 files changed

+46
-4
lines changed

2 files changed

+46
-4
lines changed

appveyor_inactive.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
version: 1.0.{build}
2+
3+
# This file defines all the magic to test the build on every push to GitHub with the help of appveyor.com
4+
# We use different (virtual) build environments that work sequentially and provide their artifacts.
5+
# The artifacts of every push/build are available in appveyor for 6 months from build.
6+
# Artifacts of tagged pushes ("unstable" or release number) are deployed into the GitHub release.
7+
8+
# define the build environments
9+
# move Ubuntu / macOS from appveyor to the faster GitHub hosted runners
10+
11+
image:
12+
- Visual Studio 2019
13+
14+
15+
# Build Windows packages
16+
before_build:
17+
- set qtpath64="C:\Qt\5.15\msvc2019_64"
18+
- set arch64=x64
19+
- set dir64=build_x64
20+
- md build_x64
21+
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
22+
- cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH=%qtpath64% -DCMAKE_BUILD_TYPE=Release -Bbuild_x64 -H.
23+
24+
build_script:
25+
- cmake --build build_x64 --config Release --target package
26+
27+
artifacts:
28+
- path: build_x64\openhantek\Release
29+
name: OpenHantek-Win-x64-Release-b$(APPVEYOR_BUILD_NUMBER)
30+
31+
32+
# Upload all packages to GitHub, but only if the push was tagged
33+
deploy:
34+
- provider: GitHub
35+
tag: $(APPVEYOR_REPO_TAG_NAME)
36+
auth_token:
37+
secure: 4TSFa7zTbxPVDkS9pGWO0BIPD9r2NnnHGe03pg5rjEuvSH5pntkmMdLM7MePJLma
38+
artifact: /.*\.deb/, /.*\.rpm/, /.*\.tar.gz/, /.*\.zip/, /.*\.dmg/
39+
prerelease: true
40+
force_update: true
41+
on:
42+
APPVEYOR_REPO_TAG: true

cmake/copy_qt5_dlls_to_bin_dir.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ endif()
88
if (MSVC)
99
add_custom_command(TARGET ${PROJECT_NAME}
1010
POST_BUILD
11-
if (EXISTS "${QT5_BIN_DIR}/qtenv2.bat")
12-
COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
11+
#if (EXISTS "${QT5_BIN_DIR}/qtenv2.bat")
12+
#COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
1313
COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/${PROJECT_NAME}.exe"
1414
WORKING_DIRECTORY "${QT5_BIN_DIR}"
1515
COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"
@@ -20,8 +20,8 @@ else()
2020
endif()
2121
add_custom_command(TARGET ${PROJECT_NAME}
2222
POST_BUILD
23-
if (EXISTS "${QT5_BIN_DIR}/qtenv2.bat")
24-
COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
23+
#if (EXISTS "${QT5_BIN_DIR}/qtenv2.bat")
24+
#COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
2525
COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations ${ADD_OPT} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.exe"
2626
WORKING_DIRECTORY "${QT5_BIN_DIR}"
2727
COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"

0 commit comments

Comments
 (0)