From 28b01cbdd14c468c246ebea6b0275f870f402b62 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 11 Dec 2017 13:20:19 +0100 Subject: [PATCH 1/4] Update to 4.1.0 --- code/Version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Version.cpp b/code/Version.cpp index 2cd7598179..fe9a2fdaaf 100644 --- a/code/Version.cpp +++ b/code/Version.cpp @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ScenePrivate.h" static const unsigned int MajorVersion = 4; -static const unsigned int MinorVersion = 0; +static const unsigned int MinorVersion = 1; // -------------------------------------------------------------------------------- // Legal information string - dont't remove this. From 406a06705e005742b4ed36f92e3f09d9a222cfc8 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 11 Dec 2017 13:21:35 +0100 Subject: [PATCH 2/4] Update Doxyfile.in Update version --- doc/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 8d51259a8b..ffe39f9f76 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -32,7 +32,7 @@ PROJECT_NAME = Assimp # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "v3.1.1 (June 2014)" +PROJECT_NUMBER = "v4.1. (December 2018)" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer From 65d29c542091c21e72b143818b708333747e36ad Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 11 Dec 2017 13:22:20 +0100 Subject: [PATCH 3/4] Update CMakeLists.txt Update version --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fc9af4676..dd2317cca9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,8 +129,8 @@ ENDIF(NOT BUILD_SHARED_LIBS) # Define here the needed parameters SET (ASSIMP_VERSION_MAJOR 4) -SET (ASSIMP_VERSION_MINOR 0) -SET (ASSIMP_VERSION_PATCH 1) +SET (ASSIMP_VERSION_MINOR 1) +SET (ASSIMP_VERSION_PATCH 0) SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH}) SET (ASSIMP_SOVERSION 4) SET (PROJECT_VERSION "${ASSIMP_VERSION}") From e8139ef5159737b62f759edf6ccd6fcbd810ea32 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 11 Dec 2017 13:30:16 +0100 Subject: [PATCH 4/4] Update utVersion.cpp Fix unittests. --- test/unit/utVersion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index 677a131c9b..a424a27cfb 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -54,7 +54,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { } TEST_F( utVersion, aiGetVersionMinorTest ) { - EXPECT_EQ( aiGetVersionMinor(), 0U ); + EXPECT_EQ( aiGetVersionMinor(), 1U ); } TEST_F( utVersion, aiGetVersionMajorTest ) {