Browse Source

Merge pull request #4353 from assimp/kimkulling-preparation_v5.2.0

Udate version to 5.2.0
Kim Kulling 3 years ago
parent
commit
83d4ab8563
3 changed files with 5 additions and 6 deletions
  1. 1 1
      CMakeLists.txt
  2. 1 2
      code/Common/Version.cpp
  3. 3 3
      test/unit/utVersion.cpp

+ 1 - 1
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 ###############################################
 

+ 1 - 2
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";
 

+ 3 - 3
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 ) {