Skip to content

Commit

Permalink
Update Win CI to Qt6.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dougmassay authored Jul 26, 2024
1 parent 44010cf commit 0e9de37
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reset-win-caches.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ reset cache on 9 September 2023
reset cache on 12 October 2023
reset cache on 19 November 2023
reset cache on 25 March 2024

reset cache on 26 July 2024
4 changes: 2 additions & 2 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ on:

env:
BUILD_TYPE: Release
DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt6.6.2e_x64_VS2022.7z
QT: Qt6.6.2
DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt6.7.2ci_x64_VS2022.7z
QT: Qt6.7.2
INNO: C:\Program Files (x86)\Inno Setup 6
CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1

Expand Down
14 changes: 14 additions & 0 deletions CMakeLists6.txt
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,20 @@ if ( MSVC )
COMMAND ${WINDEPLOYQT} --release --no-translations --no-compiler-runtime --dir ${MAIN_PACKAGE_DIR}
--libdir ${MAIN_PACKAGE_DIR} ${MAIN_PACKAGE_DIR}/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX} )

# Copy ICU libs. Windeployqt does not always pick up all three.
set( ICU_BIN_LIBS icudt icuin icuuc )
add_custom_command( TARGET ${TARGET_FOR_COPY} PRE_BUILD COMMAND cmake -E make_directory ${MAIN_PACKAGE_DIR}/ )
foreach( lib ${ICU_BIN_LIBS} )
# If the three are there (any version), copy them. Otherwise keep going without them.
file( GLOB ICU_LIB ${QT_INSTALL_BINS}/${lib}*.dll )
list( LENGTH ICU_LIB PATHS_LEN )
if( PATHS_LEN GREATER 0 )
foreach( ICU ${ICU_LIB} )
add_custom_command( TARGET ${TARGET_FOR_COPY} PRE_BUILD COMMAND cmake -E copy ${ICU} ${MAIN_PACKAGE_DIR}/ )
endforeach( ICU )
endif()
endforeach( lib )

# Copy the translation qm files
if( NOT EXISTS ${MAIN_PACKAGE_DIR}/translations )
add_custom_command( TARGET ${TARGET_FOR_COPY} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${MAIN_PACKAGE_DIR}/translations/ )
Expand Down

0 comments on commit 0e9de37

Please sign in to comment.