From 951e8e0ebeeab4fc130e05bfb2c143a394a97657 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 8 Feb 2020 23:22:31 +0000 Subject: [PATCH] cmake: Check UPDATE_APPCAST before TAG_RELEASE. Check for UPDATE_APPCAST being set before checking for TAG_RELEASE, as the UPDATE_APPCAST script may be run in the same build directory where TAG_RELEASE was just run. Signed-off-by: Rafael Kitover --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46b904c1..a01c4e17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,14 +17,14 @@ endif() set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -if(TAG_RELEASE) - include(MakeReleaseCommitAndTag) -endif() - if(UPDATE_APPCAST) include(UpdateAppcast) endif() +if(TAG_RELEASE) + include(MakeReleaseCommitAndTag) +endif() + set(VCPKG_DEPS zlib libpng SDL2 SFML gettext wxWidgets) # appveyor job goes over time limit if building ffmpeg during initial cache