diff --git a/README.md b/README.md index 470fd9d7..6d9d708e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenMesh, 5.1 +# OpenMesh, 6.0 ## Getting OpenMesh diff --git a/VERSION b/VERSION index 70bad612..3ef4bbd4 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=5.1 -MAJOR=5 -MINOR=1 +VERSION=6 +MAJOR=6 +MINOR=0 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 0127ed92..c69f8779 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.0" "C:/Program Files/OpenMesh 5.1" "C:/Program Files/OpenMesh 5.0" "C:/Program Files/OpenMesh 4.2" @@ -76,6 +77,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.0" "C:/libs/OpenMesh 5.1" "C:/libs/OpenMesh 5.0" "C:/libs/OpenMesh 4.2" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 167637a3..8a32b132 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -64,8 +64,9 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x50100 -//#define OM_VERSION 0x40200 + +#define OM_VERSION 0x60000 +//#define OM_VERSION 0x50100 // only defined, if it is a beta version //#define OM_VERSION_BETA 4