Sync root files without 'src' with Namecheap master

This commit is contained in:
Yuriy Puchkov
2021-02-20 13:11:30 +02:00
parent 96cfd44047
commit 5b15007d04
2 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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()