Merge branch 'master' into develop

Bump to 0.2.18.dev

Conflicts:
	CMakeLists.txt
	Makefile.rule
This commit is contained in:
Zhang Xianyi 2016-03-20 20:48:21 -04:00
commit 9b987badb0
3 changed files with 8 additions and 2 deletions

View File

@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8.4)
project(OpenBLAS) project(OpenBLAS)
set(OpenBLAS_MAJOR_VERSION 0) set(OpenBLAS_MAJOR_VERSION 0)
set(OpenBLAS_MINOR_VERSION 2) set(OpenBLAS_MINOR_VERSION 2)
set(OpenBLAS_PATCH_VERSION 17.dev) set(OpenBLAS_PATCH_VERSION 18.dev)
set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}") set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}")
enable_language(ASM) enable_language(ASM)

View File

@ -1,4 +1,10 @@
OpenBLAS ChangeLog OpenBLAS ChangeLog
====================================================================
Version 0.2.16
20-Mar-2016
common:
* Enable BUILD_LAPACK_DEPRECATED=1 by default.
==================================================================== ====================================================================
Version 0.2.16 Version 0.2.16
15-Mar-2016 15-Mar-2016

View File

@ -3,7 +3,7 @@
# #
# This library's version # This library's version
VERSION = 0.2.17.dev VERSION = 0.2.18.dev
# If you set the suffix, the library name will be libopenblas_$(LIBNAMESUFFIX).a # If you set the suffix, the library name will be libopenblas_$(LIBNAMESUFFIX).a
# and libopenblas_$(LIBNAMESUFFIX).so. Meanwhile, the soname in shared library # and libopenblas_$(LIBNAMESUFFIX).so. Meanwhile, the soname in shared library