Merge branch 'master' into master

This commit is contained in:
Dan Rosser
2022-01-10 14:04:24 +11:00
committed by GitHub
2 changed files with 7 additions and 5 deletions

View File

@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
add_definitions(-DASSIMP_USE_HUNTER)
ENDIF()
PROJECT(Assimp VERSION 5.1.4)
PROJECT(Assimp VERSION 5.1.6)
# All supported options ###############################################

View File

@@ -49,17 +49,21 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
std::string text( lv );
size_t pos = text.find(std::string("2021"));
EXPECT_NE( pos, std::string::npos );
EXPECT_NE(pos, std::string::npos);
}
TEST_F( utVersion, aiGetVersionMinorTest ) {
EXPECT_EQ( aiGetVersionMinor(), 1U );
EXPECT_EQ(aiGetVersionMinor(), 1U);
}
TEST_F( utVersion, aiGetVersionMajorTest ) {
EXPECT_EQ( aiGetVersionMajor(), 5U );
}
TEST_F( utVersion, aiGetVersionPatchTest ) {
EXPECT_EQ(aiGetVersionPatch(), 6U );
}
TEST_F( utVersion, aiGetCompileFlagsTest ) {
EXPECT_NE( aiGetCompileFlags(), 0U );
}
@@ -71,5 +75,3 @@ TEST_F( utVersion, aiGetVersionRevisionTest ) {
TEST_F( utVersion, aiGetBranchNameTest ) {
EXPECT_NE( nullptr, aiGetBranchName() );
}