Skip to content

Commit c1d89d1

Browse files
committed
ensure submodules are init before build
1 parent f55e5ce commit c1d89d1

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
runs-on: windows-2022
1010
steps:
1111
- uses: actions/checkout@v4
12+
with:
13+
submodules: recursive
1214

1315
- name: Cache vcpkg
1416
uses: actions/cache@v4

CMakeLists.txt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -344,21 +344,13 @@ if(WIN32)
344344

345345
if(DEFINED _qt6_debug_bin AND DEFINED _qt6_debug_plugins)
346346
add_custom_command(TARGET editor POST_BUILD
347-
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_LIST_DIR}/Run/platforms"
348-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
349-
"${_qt6_debug_bin}/Qt6Cored.dll"
350-
"${_qt6_debug_bin}/Qt6Guid.dll"
351-
"${_qt6_debug_bin}/Qt6Widgetsd.dll"
352-
"${CMAKE_CURRENT_LIST_DIR}/Run"
353-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
354-
"${_qt6_debug_plugins}/platforms/qwindowsd.dll"
355-
"${CMAKE_CURRENT_LIST_DIR}/Run/platforms"
356-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
357-
"${_qt6_debug_bin}/Qt6Cored.dll"
358-
"${_qt6_debug_bin}/Qt6Guid.dll"
359-
"${_qt6_debug_bin}/Qt6Widgetsd.dll"
360-
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin"
361-
COMMENT "Copy Qt debug DLLs and platform plugin"
362-
CONFIGURATIONS Debug)
347+
COMMAND ${CMAKE_COMMAND}
348+
-DDEPLOY_CONFIG=$<CONFIG>
349+
-DRUN_DIR="${CMAKE_CURRENT_LIST_DIR}/Run"
350+
-DQT_DEBUG_BIN="${_qt6_debug_bin}"
351+
-DQT_DEBUG_PLUGINS="${_qt6_debug_plugins}"
352+
-DQT_RELEASE_BIN="${_qt6_release_bin}"
353+
-P "${CMAKE_CURRENT_LIST_DIR}/cmake/copy_qt_debug.cmake"
354+
COMMENT "Copy Qt debug DLLs and platform plugin")
363355
endif()
364356
endif()

0 commit comments

Comments
 (0)