Quellcode durchsuchen

Merge pull request #1631 from assimp/kimkulling-410_prep

Update to 4.1.0
Kim Kulling vor 7 Jahren
Ursprung
Commit
80799bdbf9
4 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 2 2
      CMakeLists.txt
  2. 1 1
      code/Version.cpp
  3. 1 1
      doc/Doxyfile.in
  4. 1 1
      test/unit/utVersion.cpp

+ 2 - 2
CMakeLists.txt

@@ -129,8 +129,8 @@ ENDIF(NOT BUILD_SHARED_LIBS)
 
 
 # Define here the needed parameters
 # Define here the needed parameters
 SET (ASSIMP_VERSION_MAJOR 4)
 SET (ASSIMP_VERSION_MAJOR 4)
-SET (ASSIMP_VERSION_MINOR 0)
-SET (ASSIMP_VERSION_PATCH 1)
+SET (ASSIMP_VERSION_MINOR 1)
+SET (ASSIMP_VERSION_PATCH 0)
 SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
 SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
 SET (ASSIMP_SOVERSION 4)
 SET (ASSIMP_SOVERSION 4)
 SET (PROJECT_VERSION "${ASSIMP_VERSION}")
 SET (PROJECT_VERSION "${ASSIMP_VERSION}")

+ 1 - 1
code/Version.cpp

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ScenePrivate.h"
 #include "ScenePrivate.h"
 
 
 static const unsigned int MajorVersion = 4;
 static const unsigned int MajorVersion = 4;
-static const unsigned int MinorVersion = 0;
+static const unsigned int MinorVersion = 1;
 
 
 // --------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------
 // Legal information string - dont't remove this.
 // Legal information string - dont't remove this.

+ 1 - 1
doc/Doxyfile.in

@@ -32,7 +32,7 @@ PROJECT_NAME           = Assimp
 # This could be handy for archiving the generated documentation or 
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 # if some version control system is used.
 
 
-PROJECT_NUMBER         = "v3.1.1 (June 2014)"
+PROJECT_NUMBER         = "v4.1. (December 2018)"
 
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 
 # for a project that appears at the top of each page and should give viewer 

+ 1 - 1
test/unit/utVersion.cpp

@@ -54,7 +54,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
 }
 }
 
 
 TEST_F( utVersion, aiGetVersionMinorTest ) {
 TEST_F( utVersion, aiGetVersionMinorTest ) {
-    EXPECT_EQ( aiGetVersionMinor(), 0U );
+    EXPECT_EQ( aiGetVersionMinor(), 1U );
 }
 }
     
     
 TEST_F( utVersion, aiGetVersionMajorTest ) {
 TEST_F( utVersion, aiGetVersionMajorTest ) {