diff --git a/Doc/changelog.docu b/Doc/changelog.docu index e321fc9d..e33a542c 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -6,6 +6,12 @@ +7.0 (?/?/?) + + + + + 6.3 (2016/10/04) diff --git a/README.md b/README.md index 9002db78..d8a82b67 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenMesh, 6.3 +# OpenMesh, 7.0 ## Getting OpenMesh diff --git a/VERSION b/VERSION index 0e2ae490..7028d24e 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=6.3 -MAJOR=6 -MINOR=3 +VERSION=7.0 +MAJOR=7 +MINOR=0 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 307899c0..693b1517 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 7.0" "C:/Program Files/OpenMesh 6.3" "C:/Program Files/OpenMesh 6.2" "C:/Program Files/OpenMesh 6.1" @@ -81,6 +82,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 7.0" "C:/libs/OpenMesh 6.3" "C:/libs/OpenMesh 6.2" "C:/libs/OpenMesh 6.1" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index 8662bde1..2e6f50c6 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -65,8 +65,8 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x60300 -//#define OM_VERSION 0x50100 +#define OM_VERSION 0x70000 +//#define OM_VERSION 0x60300 // only defined, if it is a beta version //#define OM_VERSION_BETA 4