From 89de6df7b6566afadf621aa4b42eedf9852a51d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 9 May 2014 12:44:42 +0000 Subject: [PATCH] Bump version to 3.2 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1054 fdac6126-5c0c-442c-9429-916003d36597 --- Doc/changelog.docu | 11 +++++++++-- README | 2 +- VERSION | 4 ++-- cmake/FindOpenMesh.cmake | 2 ++ src/OpenMesh/Core/System/config.h | 3 +-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index f92c197d..0e5ee219 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -7,6 +7,15 @@ +3.2 (?/?/?,Rev.1052) + +IO + + + + 3.1 (2014/05/09,Rev.1050) Core @@ -54,8 +63,6 @@
  • Added OpenMesh finder. Closes 959
  • - - 3.0 (2014/02/05,Rev.990) diff --git a/README b/README index a04c22f9..979ca68d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -OpenMesh, 3.1 +OpenMesh, 3.2 ~~~~~~~~~~~~~~~ 0. Licence diff --git a/VERSION b/VERSION index c490ddf6..218c0a1f 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=3.1 +VERSION=3.2 MAJOR=3 -MINOR=1 +MINOR=2 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 7aa0fc57..75573f93 100644 --- a/cmake/FindOpenMesh.cmake +++ b/cmake/FindOpenMesh.cmake @@ -56,11 +56,13 @@ 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 3.2" "C:/Program Files/OpenMesh 3.1" "C:/Program Files/OpenMesh 3.0" "C:/Program Files/OpenMesh 2.4.1" "C:/Program Files/OpenMesh 2.4" "C:/Program Files/OpenMesh 2.0/include" + "C:/libs/OpenMesh 3.2" "C:/libs/OpenMesh 3.1" "C:/libs/OpenMesh 3.0" "C:/libs/OpenMesh 2.4.1" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index e016cf53..07c242d7 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -57,8 +57,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x30100 -//#define OM_VERSION 0x20400 +#define OM_VERSION 0x30200 // only defined, if it is a beta version //#define OM_VERSION_BETA 4