Merge branch 'master' into master
commit
00bf74ad6d
|
@ -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 ###############################################
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,10 @@ 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() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue