Merge branch 'VERSION_file_removal' into 'master'

Version file removal

See merge request OpenMesh/OpenMesh!294

.gitignore

@@ -1,6 +1,6 @@
 .project
 .cproject
-CMakeLists.txt.user
+CMakeLists.txt.user*
 build*
 *.swp
 .settings

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 VERSION 9.0.0) 
-    project (OpenMesh)
-endif()
 
 # Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
@@ -43,11 +41,8 @@ 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")
+if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
     include(OpenMeshPackage)
 endif()
 
@@ -88,7 +83,7 @@ if ( NOT DEFINED BUILD_APPS )
 endif()
 
 # Only call fixbundle, when we are building OpenMesh standalone
-if( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
+if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
 
   if (WIN32)
     if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS )
@@ -120,7 +115,7 @@ if (OPENMESH_BENCHMARK_DIR)
 endif()
 
 # Do not build unit tests when build as external library
-if(${PROJECT_NAME} MATCHES "OpenMesh")
+if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
     add_subdirectory (src/Unittests)
 else()
 	# If built as a dependent project simulate effects of
@@ -152,7 +147,7 @@ endif()
 # ========================================================================
 
 # Only call fixbundle, when we are building OpenMesh standalone
-if(${PROJECT_NAME} MATCHES "OpenMesh")
+if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
 
   if (WIN32 AND  BUILD_APPS)
     # prepare bundle generation cmake file and add a build target for it

Doc/changelog.docu

@@ -26,11 +26,16 @@
 <b>IO</b>
 <ul>
 <li>STL Reader: Change stl reader behaviour on extension .stl , Don't check for the solid keyword explicitly</li>
+<li>OM Writer: Removed debug output</li>
 </ul>
 
 <b>Build System</b>
 <ul>
 <li>Dropped 32-bit Windows continuous integration and artifact builds.</li>
+<li>Removed the VERSION file and do it via cmakes project call)
+<li>Switched to external cmake-library used by all of our projects now</li>
+<li>Removed custom Eigen3 finder. Eigen3 has full cmake support. (You can point OpenMesh to eigen via -DEigen3_DIR="c:\<path>" )
+<li>Added support for and fixed some issues with VS2019</li>
 </ul>
 
 </tr>

VERSION

@@ -1,6 +0,0 @@
-VERSION=9.0
-MAJOR=9
-MINOR=0
-PATCH=0
-ID=OPENMESH
-

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_MAJOR "${PROJECT_VERSION_MAJOR}")
-set (CPACK_PACKAGE_VERSION_MINOR "${OPENMESH_VERSION_MINOR}")
+set (CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
-set (CPACK_PACKAGE_VERSION_PATCH "${OPENMESH_VERSION_PATCH}")
+set (CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-set (CPACK_PACKAGE_VERSION "${OPENMESH_VERSION}")
+set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
 
 # addition package info
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenMesh")

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}

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}
+  set_target_properties (OpenMeshCore PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-                                               SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
+                                               SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 
 endif ()
 

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}
+  set_target_properties (OpenMeshTools PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-                                                SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
+                                                SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 endif ()
 
 target_link_libraries (OpenMeshTools OpenMeshCore)