diff --git a/Doc/changelog.docu b/Doc/changelog.docu index bf24340b..83fcc462 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -6,6 +6,10 @@ +3.4 (?/?/?,Rev.1204) + + + 3.3 (2015/01/16,Rev.1204) Core diff --git a/README b/README index abe7403f..c6351931 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -OpenMesh, 3.3 +OpenMesh, 3.4 ~~~~~~~~~~~~~~~ 0. Licence diff --git a/VERSION b/VERSION index 81bc0a09..5993599a 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=3.3 +VERSION=3.4 MAJOR=3 -MINOR=3 +MINOR=4 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index aa6f1f99..34ba6e1c 100644 --- a/cmake/FindOpenMesh.cmake +++ b/cmake/FindOpenMesh.cmake @@ -56,6 +56,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 3.4" "C:/Program Files/OpenMesh 3.3" "C:/Program Files/OpenMesh 3.2" "C:/Program Files/OpenMesh 3.1" @@ -63,6 +64,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 3.4" "C:/libs/OpenMesh 3.3" "C:/libs/OpenMesh 3.2" "C:/libs/OpenMesh 3.1" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 6d9aa7eb..586568c7 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -57,7 +57,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x30300 +#define OM_VERSION 0x30400 // only defined, if it is a beta version //#define OM_VERSION_BETA 4