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 <rkitover@gmail.com>
This commit is contained in:
parent
9475474ee6
commit
951e8e0ebe
|
@ -17,14 +17,14 @@ endif()
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
|
||||||
if(TAG_RELEASE)
|
|
||||||
include(MakeReleaseCommitAndTag)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(UPDATE_APPCAST)
|
if(UPDATE_APPCAST)
|
||||||
include(UpdateAppcast)
|
include(UpdateAppcast)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(TAG_RELEASE)
|
||||||
|
include(MakeReleaseCommitAndTag)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(VCPKG_DEPS zlib libpng SDL2 SFML gettext wxWidgets)
|
set(VCPKG_DEPS zlib libpng SDL2 SFML gettext wxWidgets)
|
||||||
|
|
||||||
# appveyor job goes over time limit if building ffmpeg during initial cache
|
# appveyor job goes over time limit if building ffmpeg during initial cache
|
||||||
|
|
Loading…
Reference in New Issue