From c9510459caad6b392bab6bc9208caf3527d3faa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 11 Jul 2016 16:23:12 +0200 Subject: [PATCH] Bump version to 6.3 development --- .gitignore | 1 + Doc/changelog.docu | 4 ++++ README.md | 2 +- VERSION | 4 ++-- cmake/FindOpenMesh.cmake | 2 ++ src/OpenMesh/Core/System/config.h | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 09853e75..1dcb0521 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .cproject CMakeLists.txt.user build* +*.swp diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 53550022..cf4bb4e4 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -7,6 +7,10 @@ +6.3 (?/?/?) + + + 6.2 (2016/07/11) General diff --git a/README.md b/README.md index d237f358..9002db78 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenMesh, 6.2 +# OpenMesh, 6.3 ## Getting OpenMesh diff --git a/VERSION b/VERSION index 9d3a7153..0e2ae490 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=6.2 +VERSION=6.3 MAJOR=6 -MINOR=2 +MINOR=3 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 2adc4d99..307899c0 100644 --- a/cmake/FindOpenMesh.cmake +++ b/cmake/FindOpenMesh.cmake @@ -63,6 +63,7 @@ IF (NOT OPENMESH_FOUND) "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh" + "C:/Program Files/OpenMesh 6.3" "C:/Program Files/OpenMesh 6.2" "C:/Program Files/OpenMesh 6.1" "C:/Program Files/OpenMesh 6.0" @@ -80,6 +81,7 @@ IF (NOT OPENMESH_FOUND) "C:/Program Files/OpenMesh 2.4.1" "C:/Program Files/OpenMesh 2.4" "C:/Program Files/OpenMesh 2.0/include" + "C:/libs/OpenMesh 6.3" "C:/libs/OpenMesh 6.2" "C:/libs/OpenMesh 6.1" "C:/libs/OpenMesh 6.0" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 31537b5e..b247f812 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -65,7 +65,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x60200 +#define OM_VERSION 0x60300 //#define OM_VERSION 0x50100 // only defined, if it is a beta version -- GitLab