Skip to content
Permalink
Browse files

Update pocl git master to 1.6-pre

  • Loading branch information
Michal Babej
Michal Babej committed Mar 25, 2020
1 parent 282ff4f commit 07e70ca6b06675509ff6736b8bf2ede4ea174764
Showing with 11 additions and 6 deletions.
  1. +4 −0 CHANGES
  2. +5 −4 CMakeLists.txt
  3. +2 −2 doc/sphinx/source/conf.py
@@ -1,3 +1,7 @@
1.6 unreleased
==============


1.5 April 2020
==============

@@ -75,8 +75,8 @@ endif()


set(MAJOR_VERSION 1)
set(MINOR_VERSION 5)
set(VERSION_SUFFIX_FIXED_TEXT "")
set(MINOR_VERSION 6)
set(VERSION_SUFFIX_FIXED_TEXT "-pre")
set(VERSION_SUFFIX "${VERSION_SUFFIX_FIXED_TEXT}")
set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX})
set(POCL_VERSION ${VERSION_STRING})
@@ -1339,10 +1339,11 @@ endif()
# 5:0:3 == 1.3 (the libpocl.so will be named libpocl.so.2.3.X )
# 6:0:4 == 1.4 (the libpocl.so will be named libpocl.so.2.4.X )
# 7:0:5 == 1.5 (the libpocl.so will be named libpocl.so.2.5.X )
# 8:0:6 == 1.6 (the libpocl.so will be named libpocl.so.2.6.X )

set(LIB_CURRENT_VERSION 7)
set(LIB_CURRENT_VERSION 8)
set(LIB_REVISION_VERSION 0)
set(LIB_AGE_VERSION 5)
set(LIB_AGE_VERSION 6)

math(EXPR LIB_FIRST_VERSION "${LIB_CURRENT_VERSION} - ${LIB_AGE_VERSION}")

@@ -45,9 +45,9 @@
# built documents.
#
# The short X.Y version.
version = '1.5'
version = '1.6'
# The full version, including alpha/beta/rc tags.
release = '1.5'
release = '1.6-pre'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

0 comments on commit 07e70ca

Please sign in to comment.
You can’t perform that action at this time.