Skip to content

Commit 80799bd

Browse files
authored
Merge pull request assimp#1631 from assimp/kimkulling-410_prep
Update to 4.1.0
2 parents 899748c + e8139ef commit 80799bd

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ ENDIF(NOT BUILD_SHARED_LIBS)
129129

130130
# Define here the needed parameters
131131
SET (ASSIMP_VERSION_MAJOR 4)
132-
SET (ASSIMP_VERSION_MINOR 0)
133-
SET (ASSIMP_VERSION_PATCH 1)
132+
SET (ASSIMP_VERSION_MINOR 1)
133+
SET (ASSIMP_VERSION_PATCH 0)
134134
SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
135135
SET (ASSIMP_SOVERSION 4)
136136
SET (PROJECT_VERSION "${ASSIMP_VERSION}")

code/Version.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4646
#include "ScenePrivate.h"
4747

4848
static const unsigned int MajorVersion = 4;
49-
static const unsigned int MinorVersion = 0;
49+
static const unsigned int MinorVersion = 1;
5050

5151
// --------------------------------------------------------------------------------
5252
// Legal information string - dont't remove this.

doc/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PROJECT_NAME = Assimp
3232
# This could be handy for archiving the generated documentation or
3333
# if some version control system is used.
3434

35-
PROJECT_NUMBER = "v3.1.1 (June 2014)"
35+
PROJECT_NUMBER = "v4.1. (December 2018)"
3636

3737
# Using the PROJECT_BRIEF tag one can provide an optional one line description
3838
# for a project that appears at the top of each page and should give viewer

test/unit/utVersion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
5454
}
5555

5656
TEST_F( utVersion, aiGetVersionMinorTest ) {
57-
EXPECT_EQ( aiGetVersionMinor(), 0U );
57+
EXPECT_EQ( aiGetVersionMinor(), 1U );
5858
}
5959

6060
TEST_F( utVersion, aiGetVersionMajorTest ) {

0 commit comments

Comments
 (0)