diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 1b48275c..95626909 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -6,6 +6,10 @@ +6.1 (?/?/?) + + + 6.0 (2016/29/04) @@ -18,7 +22,7 @@ VectorT diff --git a/README.md b/README.md index 6d9d708e..df469817 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenMesh, 6.0 +# OpenMesh, 6.1 ## Getting OpenMesh diff --git a/VERSION b/VERSION index 3ef4bbd4..b4208bed 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=6 +VERSION=6.1 MAJOR=6 -MINOR=0 +MINOR=1 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 1a21f716..6e34ccb1 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.1" "C:/Program Files/OpenMesh 6.0" "C:/Program Files/OpenMesh 5.2" "C:/Program Files/OpenMesh 5.1" @@ -78,6 +79,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.1" "C:/libs/OpenMesh 6.0" "C:/libs/OpenMesh 5.2" "C:/libs/OpenMesh 5.1" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 8a32b132..3588235d 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -65,7 +65,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x60000 +#define OM_VERSION 0x60100 //#define OM_VERSION 0x50100 // only defined, if it is a beta version