v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

pull/4330/head
Dan Rosser 2022-01-10 14:04:24 +11:00 committed by GitHub
parent 9c4255b486 8134cae998
commit 00bf74ad6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

10
test/unit/utVersion.cpp
View File

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