Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
Qtquick3d Assimp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Karlsson
Qtquick3d Assimp
Commits
83d4ab85
Unverified
Commit
83d4ab85
authored
3 years ago
by
Kim Kulling
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #4353 from assimp/kimkulling-preparation_v5.2.0
Udate version to 5.2.0
parents
c5634be7
91737f1c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
code/Common/Version.cpp
+1
-2
1 addition, 2 deletions
code/Common/Version.cpp
test/unit/utVersion.cpp
+3
-3
3 additions, 3 deletions
test/unit/utVersion.cpp
with
5 additions
and
6 deletions
CMakeLists.txt
+
1
−
1
View file @
83d4ab85
...
...
@@ -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 ###############################################
...
...
This diff is collapsed.
Click to expand it.
code/Common/Version.cpp
+
1
−
2
View file @
83d4ab85
...
...
@@ -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-202
1
, Assimp team
\n
"
"(c) 2006-202
2
, Assimp team
\n
"
"License under the terms and conditions of the 3-clause BSD license
\n
"
"https://www.assimp.org
\n
"
;
...
...
This diff is collapsed.
Click to expand it.
test/unit/utVersion.cpp
+
3
−
3
View file @
83d4ab85
...
...
@@ -48,12 +48,12 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
EXPECT_NE
(
lv
,
nullptr
);
std
::
string
text
(
lv
);
size_t
pos
=
text
.
find
(
std
::
string
(
"202
1
"
));
size_t
pos
=
text
.
find
(
std
::
string
(
"202
2
"
));
EXPECT_NE
(
pos
,
std
::
string
::
npos
);
}
TEST_F
(
utVersion
,
aiGetVersionMinorTest
)
{
EXPECT_EQ
(
aiGetVersionMinor
(),
1
U
);
EXPECT_EQ
(
aiGetVersionMinor
(),
2
U
);
}
TEST_F
(
utVersion
,
aiGetVersionMajorTest
)
{
...
...
@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
}
TEST_F
(
utVersion
,
aiGetVersionPatchTest
)
{
EXPECT_EQ
(
aiGetVersionPatch
(),
6
U
);
EXPECT_EQ
(
aiGetVersionPatch
(),
0
U
);
}
TEST_F
(
utVersion
,
aiGetCompileFlagsTest
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment