| 3.2 (2014/07/18,Rev.1107) |
Core
@@ -42,7 +46,7 @@
- Qt5 support for example apps
- Improved OpenMesh cmake gtest finder for Xcode 5.1.1 with gtest 1.7
-- Don't copy qt4 anymore, if build_apps is diasabled, but the qmake variable still defined
+- Don't copy qt4 anymore, if build_apps is disabled, but the qmake variable still defined
- Add dependencies and fixbundle for apps only if we build apps
diff --git a/README b/README
index 979ca68d..abe7403f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-OpenMesh, 3.2
+OpenMesh, 3.3
~~~~~~~~~~~~~~~
0. Licence
diff --git a/VERSION b/VERSION
index 218c0a1f..81bc0a09 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
-VERSION=3.2
+VERSION=3.3
MAJOR=3
-MINOR=2
+MINOR=3
PATCH=0
ID=OPENMESH
diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake
index 75573f93..aa6f1f99 100644
--- a/cmake/FindOpenMesh.cmake
+++ b/cmake/FindOpenMesh.cmake
@@ -56,21 +56,20 @@ 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.3"
"C:/Program Files/OpenMesh 3.2"
"C:/Program Files/OpenMesh 3.1"
"C:/Program Files/OpenMesh 3.0"
"C:/Program Files/OpenMesh 2.4.1"
"C:/Program Files/OpenMesh 2.4"
"C:/Program Files/OpenMesh 2.0/include"
+ "C:/libs/OpenMesh 3.3"
"C:/libs/OpenMesh 3.2"
"C:/libs/OpenMesh 3.1"
"C:/libs/OpenMesh 3.0"
"C:/libs/OpenMesh 2.4.1"
"C:/libs/OpenMesh 2.4"
"${OPENMESH_LIBRARY_DIR}"
-
- /ACG/acgdev/gcc-4.0-x86_64/OM2/OpenMesh-2.0/installed/include
- /ACG/acgdev/gcc-4.0-x86_64/OM2/OpenMesh-2.0/installed/lib/OpenMesh/
)
FIND_PATH (OPENMESH_INCLUDE_DIR OpenMesh/Core/Mesh/PolyMeshT.hh
diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h
index 07c242d7..6d9aa7eb 100644
--- a/src/OpenMesh/Core/System/config.h
+++ b/src/OpenMesh/Core/System/config.h
@@ -57,7 +57,7 @@
// ----------------------------------------------------------------------------
-#define OM_VERSION 0x30200
+#define OM_VERSION 0x30300
// only defined, if it is a beta version
//#define OM_VERSION_BETA 4
|