From 1d34cb2c7291cb8b9ca5ab2f3d876326b13d1b5c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 23 Jan 2022 21:09:20 +0100 Subject: [PATCH 1/3] Udate version to 5.2.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0ec4cea9..0c4e7dbd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF() -PROJECT(Assimp VERSION 5.1.6) +PROJECT(Assimp VERSION 5.2.0) # All supported options ############################################### From c4a66ae9883d50dd845353107ec140ae4a55d172 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 23 Jan 2022 21:10:19 +0100 Subject: [PATCH 2/3] Update utVersion.cpp --- test/unit/utVersion.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index 0fc338f02..7548417e7 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -48,12 +48,12 @@ TEST_F( utVersion, aiGetLegalStringTest ) { EXPECT_NE( lv, nullptr ); std::string text( lv ); - size_t pos = text.find(std::string("2021")); + size_t pos = text.find(std::string("2022")); EXPECT_NE(pos, std::string::npos); } TEST_F( utVersion, aiGetVersionMinorTest ) { - EXPECT_EQ(aiGetVersionMinor(), 1U); + EXPECT_EQ(aiGetVersionMinor(), 2U); } TEST_F( utVersion, aiGetVersionMajorTest ) { @@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) { } TEST_F( utVersion, aiGetVersionPatchTest ) { - EXPECT_EQ(aiGetVersionPatch(), 6U ); + EXPECT_EQ(aiGetVersionPatch(), 0U ); } TEST_F( utVersion, aiGetCompileFlagsTest ) { From 91737f1cc936011785c110e3227db20677a3e4c9 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 23 Jan 2022 21:18:31 +0100 Subject: [PATCH 3/3] Fix copyright: last year --- code/Common/Version.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp index 20533ab80..86d3f2220 100644 --- a/code/Common/Version.cpp +++ b/code/Common/Version.cpp @@ -5,7 +5,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2022, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -53,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static const char *LEGAL_INFORMATION = "Open Asset Import Library (Assimp).\n" "A free C/C++ library to import various 3D file formats into applications\n\n" - "(c) 2006-2021, Assimp team\n" + "(c) 2006-2022, Assimp team\n" "License under the terms and conditions of the 3-clause BSD license\n" "https://www.assimp.org\n";