Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-1.3'

This commit is contained in:
John Maguire 2016-04-19 16:04:46 +01:00
parent 0451240df8 97ee6d3202
commit 22b7101023
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -216,7 +216,7 @@ optional_component(SEAFILE ON "Seafile support"
DEPENDS "Taglib 1.8" "TAGLIB_VERSION VERSION_GREATER 1.7.999"
)
optional_component(AMAZON_CLOUD_DRIVE ON "Amazon Cloud Drive support"
optional_component(AMAZON_CLOUD_DRIVE OFF "Amazon Cloud Drive support"
DEPENDS "Google sparsehash" SPARSEHASH_INCLUDE_DIRS
DEPENDS "Taglib 1.8" "TAGLIB_VERSION VERSION_GREATER 1.7.999"
)

8
cmake/Version.cmake
View File

@ -2,12 +2,12 @@
# Version numbers.
set(CLEMENTINE_VERSION_MAJOR 1)
set(CLEMENTINE_VERSION_MINOR 2)
set(CLEMENTINE_VERSION_PATCH 3)
# set(CLEMENTINE_VERSION_PRERELEASE rc4)
set(CLEMENTINE_VERSION_MINOR 3)
set(CLEMENTINE_VERSION_PATCH 0)
#set(CLEMENTINE_VERSION_PRERELEASE rc2)
# This should be set to OFF in a release branch
set(INCLUDE_GIT_REVISION ON)
set(INCLUDE_GIT_REVISION OFF)
# Rules about version number comparison on different platforms:
# Debian: