diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index 96e71f4f..4a431461 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -76,7 +76,9 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV + # This will allow to build pre-preleases without git tag + # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV + echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV - name: Restore from cache and run vcpkg uses: lukka/run-vcpkg@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ad3c3b4..cda1da36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,6 @@ set(PROJECT_NAME_CAPITALIZED "Flameshot") # This can be read from ${PROJECT_NAME} after project() is called if (APPLE) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") - # # Required to generate MOC - # add_subdirectory(external/QHotkey) endif()