Skip to content

Commit 31bda7b

Browse files
committed
remove windeployqt6
1 parent a376351 commit 31bda7b

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
name: "Linux (amd64; qt6)"
5959
runs-on: ubuntu-latest
6060
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"
61+
6162
steps:
6263
- name: Install dependencies
6364
run: |

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -916,11 +916,7 @@ IF(WIN32)
916916
SET(ISS_AUTOGENERATED_WARNING "Do not edit this file! It has been automatically generated by CMake. Your changes will be lost the next time CMake is run.")
917917

918918
GET_FILENAME_COMPONENT(_qt_bin_dir "${QMAKE_LOCATION}" DIRECTORY)
919-
IF(Qt6_FOUND)
920-
FIND_PROGRAM(WINDEPLOYQT_COMMAND windeployqt6 HINTS "${_qt_bin_dir}")
921-
ELSE()
922-
FIND_PROGRAM(WINDEPLOYQT_COMMAND windeployqt HINTS "${_qt_bin_dir}")
923-
ENDIF()
919+
FIND_PROGRAM(WINDEPLOYQT_COMMAND windeployqt HINTS "${_qt_bin_dir}")
924920
IF(WINDEPLOYQT_COMMAND)
925921
MESSAGE(STATUS "Found windeployqt: ${WINDEPLOYQT_COMMAND}")
926922
ELSE()

plugins/SkyCultureMaker/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ SET_TARGET_PROPERTIES(SkyCultureMaker-static PROPERTIES OUTPUT_NAME "SkyCultureM
7979
list(APPEND SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets)
8080
# SCM_CONVERTER_ENABLED is inherited from the parent CMakeLists.txt scope
8181
if(SCM_CONVERTER_ENABLED)
82-
list(APPEND SKY_CULTURESKY_CULTURE_MAKER_PLUGIN_LINK_LIBS_MAKER_PLUGIN_LINK_LIBS skyculture_converter_lib unarr)
82+
list(APPEND SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS skyculture_converter_lib unarr)
8383
endif()
8484

8585
TARGET_LINK_LIBRARIES(SkyCultureMaker-static ${SKY_CULTURE_MAKER_PLUGIN_LINK_LIBS})

0 commit comments

Comments
 (0)