From fad45b7fd6a721aa224c53a8f789adec07d63431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 13 Jul 2015 13:05:22 +0000 Subject: [PATCH] Updated files to version 4.1 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1313 fdac6126-5c0c-442c-9429-916003d36597 --- Doc/changelog.docu | 3 +++ README | 2 +- VERSION | 4 ++-- cmake/FindOpenMesh.cmake | 1 + release.howto | 2 +- src/OpenMesh/Core/System/config.h | 3 +-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 937c61a3..bfc243e8 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -6,6 +6,9 @@ +4.1 (?/?/?,Rev.1308) + + 4.0 (2015/07/08,Rev.1308) LICENSE diff --git a/README b/README index 468bffc5..248a8b8d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -OpenMesh, 4.0 +OpenMesh, 4.1 ~~~~~~~~~~~~~~~ 0. Licence diff --git a/VERSION b/VERSION index dea81e0a..f22148b0 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=4.0 +VERSION=4.1 MAJOR=4 -MINOR=0 +MINOR=1 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 15ea0068..3d22dfe3 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 4.1" "C:/Program Files/OpenMesh 4.0" "C:/Program Files/OpenMesh 3.4" "C:/Program Files/OpenMesh 3.3" diff --git a/release.howto b/release.howto index 21b7ce64..c8e9a160 100644 --- a/release.howto +++ b/release.howto @@ -2,7 +2,7 @@ 2. check files with release numbers: cmake/FindOpenMesh.cmake Doc/changelog.docu - System/config.h + src/OpenMesh/Core/System/config.h README VERSION 3. Tag the current version in the svn (checkout, remove .svn readd as tag) diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 659e3b03..c574b1f3 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -64,8 +64,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x40000 -// #define OM_VERSION 0x30400 +#define OM_VERSION 0x40100 // only defined, if it is a beta version //#define OM_VERSION_BETA 4