From 794f2fca6bdb9c95a43ad5aa833ce2edaf74dc16 Mon Sep 17 00:00:00 2001 From: lanthora Date: Fri, 30 May 2025 15:00:00 +0800 Subject: [PATCH] fix: windows crash --- .github/workflows/check.yaml | 2 +- .github/workflows/release.yaml | 2 +- CMakeLists.txt | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 5fdc386..a4e2a51 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -35,7 +35,7 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ hashFiles('CMakeLists.txt') }} + key: ${{ hashFiles('CMakeLists.txt','.github/workflows/check.yaml') }} - name: build shell: msys2 {0} run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 14f1fd1..2aa2c5d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,7 +27,7 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ hashFiles('CMakeLists.txt') }} + key: ${{ hashFiles('CMakeLists.txt','.github/workflows/release.yaml') }} - name: build shell: msys2 {0} run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d30cc4..02a47d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.28) project(cake LANGUAGES CXX) -set (CANDY_VERSION "6.0.1") +set (CANDY_VERSION "6.0.2") set (CAKE_RELEASE "1") set(CMAKE_AUTOUIC ON) @@ -36,14 +36,9 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Gui Qt6::C set_target_properties(cake PROPERTIES QT_TARGET_DESCRIPTION "Cake" + WIN32_EXECUTABLE TRUE ) -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set_target_properties(cake PROPERTIES WIN32_EXECUTABLE FALSE) -else() - set_target_properties(cake PROPERTIES WIN32_EXECUTABLE TRUE) -endif() - include(FetchContent) FetchContent_Declare( candy