correct Easy3D version numbers

LiangliangNan · Feb 27, 2024 · 1c4c738 · 1c4c738
1 parent 69eb4a4
commit 1c4c738
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.12)
 
 ################################################################################
 
-set(Easy3D_MAJOR_VERSION 2)
-set(Easy3D_MINOR_VERSION 5)
-set(Easy3D_PATCH_VERSION 3)
-set(Easy3D_VERSION ${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION})
+set(Easy3D_VERSION_MAJOR 2)
+set(Easy3D_VERSION_MINOR 5)
+set(Easy3D_VERSION_PATCH 3)
+set(Easy3D_VERSION ${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH})
 set(Easy3D_VERSION_NUMBER 10${Easy3D_VERSION_MAJOR}0${Easy3D_VERSION_MINOR}0${Easy3D_VERSION_PATCH})
 
 project(Easy3D VERSION ${Easy3D_VERSION})

diff --git a/applications/Mapple/CMakeLists.txt b/applications/Mapple/CMakeLists.txt
@@ -189,9 +189,9 @@ elseif (APPLE)
             MACOSX_BUNDLE_GUI_IDENTIFIER ${PROJECT_NAME}
             MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Mapple/resources/Mac/Mapple.plist"
             MACOSX_BUNDLE_ICON_FILE "Mapple.icns"
-            MACOSX_BUNDLE_SHORT_VERSION_STRING "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
-            MACOSX_BUNDLE_LONG_VERSION_STRING "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
-            MACOSX_BUNDLE_BUNDLE_VERSION "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
+            MACOSX_BUNDLE_SHORT_VERSION_STRING "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
+            MACOSX_BUNDLE_LONG_VERSION_STRING "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
+            MACOSX_BUNDLE_BUNDLE_VERSION "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
             INSTALL_RPATH "@executable_path/../Frameworks"
             )
 else () #Linux

diff --git a/easy3d/util/version.h b/easy3d/util/version.h
@@ -50,10 +50,10 @@ namespace easy3d {
 }
 
 /// Easy3D version number, in the format '10[MAJOR]0[MINOR]0[PATCH]'
-#define EASY3D_VERSION_NR 1000
+#define EASY3D_VERSION_NR 1020503
 
 /// Easy3D release date, in the format 'YYYYMMDD'
-#define EASY3D_RELEASE_DATE 20240223
+#define EASY3D_RELEASE_DATE 20240227
 
 
 #endif  // EASY3D_UTIL_VERSION_H
diff --git a/tutorials/Tutorial_203_Viewer_wxWidgets/CMakeLists.txt b/tutorials/Tutorial_203_Viewer_wxWidgets/CMakeLists.txt
@@ -64,9 +64,9 @@ elseif (APPLE)
             MACOSX_BUNDLE TRUE
             MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/resources/Mac/Info.plist"
             MACOSX_BUNDLE_ICON_FILE "sample.icns"
-			MACOSX_BUNDLE_SHORT_VERSION_STRING "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
-            MACOSX_BUNDLE_LONG_VERSION_STRING "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
-            MACOSX_BUNDLE_BUNDLE_VERSION "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
+			MACOSX_BUNDLE_SHORT_VERSION_STRING "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
+            MACOSX_BUNDLE_LONG_VERSION_STRING "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
+            MACOSX_BUNDLE_BUNDLE_VERSION "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
             MACOSX_BUNDLE_COPYRIGHT "Copyright [email protected]"
             MACOSX_BUNDLE_GUI_IDENTIFIER "Easy3D.Viewer.wxWidgets"
             )

diff --git a/tutorials/Tutorial_204_Viewer_Qt/CMakeLists.txt b/tutorials/Tutorial_204_Viewer_Qt/CMakeLists.txt
@@ -59,9 +59,9 @@ elseif (APPLE)
             MACOSX_BUNDLE TRUE
             MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/Mac/ViewerQt.plist"
             MACOSX_BUNDLE_ICON_FILE "ViewerQt.icns"
-            MACOSX_BUNDLE_SHORT_VERSION_STRING "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
-            MACOSX_BUNDLE_LONG_VERSION_STRING "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
-            MACOSX_BUNDLE_BUNDLE_VERSION "${Easy3D_MAJOR_VERSION}.${Easy3D_MINOR_VERSION}.${Easy3D_PATCH_VERSION}"
+            MACOSX_BUNDLE_SHORT_VERSION_STRING "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
+            MACOSX_BUNDLE_LONG_VERSION_STRING "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
+            MACOSX_BUNDLE_BUNDLE_VERSION "${Easy3D_VERSION_MAJOR}.${Easy3D_VERSION_MINOR}.${Easy3D_VERSION_PATCH}"
 			MACOSX_BUNDLE_COPYRIGHT "Copyright [email protected]"
             MACOSX_BUNDLE_GUI_IDENTIFIER "Easy3D.Viewer.Qt"
             )