diff --git a/CMakeLists.txt b/CMakeLists.txt index 316f7c03b..6da158efd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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" ) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index bd78c06c2..411074069 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -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: