diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46c329ef..7d199df8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,8 @@ set( CMAKE_CXX_STANDARD 11 )
 
 enable_testing()
 
-# Only set project name if OpenMesh is built as stand-alone library
-if("${PROJECT_NAME}" STREQUAL "")
-    project (OpenMesh)
-endif()
+
+project (OpenMesh VERSION 9.0.0) 
 
 # Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
@@ -43,9 +41,6 @@ set (CMAKE_DEBUG_POSTFIX "d")
 # include our cmake files
 include (VCICommon)
 
-vci_get_version ()
-
-
 # Disable package building when built as an external library
 if(${PROJECT_NAME} MATCHES "OpenMesh")
     include(OpenMeshPackage)
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 77582fff..00000000
--- a/VERSION
+++ /dev/null
@@ -1,6 +0,0 @@
-VERSION=9.0
-MAJOR=9
-MINOR=0
-PATCH=0
-ID=OPENMESH
-
diff --git a/cmake-library b/cmake-library
index 05efd852..bce3f7ba 160000
--- a/cmake-library
+++ b/cmake-library
@@ -1 +1 @@
-Subproject commit 05efd8523dbb92b34c4de77b90e55d659839ae3e
+Subproject commit bce3f7ba87397b0e8d54394aafd447402e3ee9dd
diff --git a/cmake/OpenMeshPackage.cmake b/cmake/OpenMeshPackage.cmake
index 39b36b21..2cc10674 100644
--- a/cmake/OpenMeshPackage.cmake
+++ b/cmake/OpenMeshPackage.cmake
@@ -10,10 +10,10 @@ set (CPACK_PACKAGE_NAME "OpenMesh")
 set (CPACK_PACKAGE_VENDOR "VCI")
 
 # set version
-set (CPACK_PACKAGE_VERSION_MAJOR "${OPENMESH_VERSION_MAJOR}")
-set (CPACK_PACKAGE_VERSION_MINOR "${OPENMESH_VERSION_MINOR}")
-set (CPACK_PACKAGE_VERSION_PATCH "${OPENMESH_VERSION_PATCH}")
-set (CPACK_PACKAGE_VERSION "${OPENMESH_VERSION}")
+set (CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
+set (CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
+set (CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
+set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
 
 # addition package info
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenMesh")
diff --git a/openmesh.pc.in b/openmesh.pc.in
index 99c3437d..1d739832 100644
--- a/openmesh.pc.in
+++ b/openmesh.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: libOpenMesh
 Description: OpenMesh library
-Version: @OPENMESH_VERSION_MAJOR@.@OPENMESH_VERSION_MINOR@
+Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@
 
 Libs: -L${libdir} @PRIVATE_LIBS@
 Cflags: -I${includedir}
diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
index e92cda32..468cf99a 100644
--- a/src/OpenMesh/Core/CMakeLists.txt
+++ b/src/OpenMesh/Core/CMakeLists.txt
@@ -42,8 +42,8 @@ if (WIN32)
 
 else ()
   vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
-  set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
-                                               SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
+  set_target_properties (OpenMeshCore PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+                                               SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 
 endif ()
 
diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
index 5659d133..cb0defad 100644
--- a/src/OpenMesh/Tools/CMakeLists.txt
+++ b/src/OpenMesh/Tools/CMakeLists.txt
@@ -44,8 +44,8 @@ if (WIN32)
 
 else ()
   vci_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
-  set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
-                                                SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
+  set_target_properties (OpenMeshTools PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+                                                SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 endif ()
 
 target_link_libraries (OpenMeshTools OpenMeshCore)