From 510898ee07c7564126f8809ab892dc109e6127d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Jan 2021 12:27:47 +0100 Subject: [PATCH 1/5] Ignore cmakelists user files from qtcreator --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index de469da2..210ba9f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .project .cproject -CMakeLists.txt.user +CMakeLists.txt.user* build* *.swp .settings From 90bb606aa61aeaec92acb54772e9db1a47427aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Jan 2021 12:29:24 +0100 Subject: [PATCH 2/5] Removed the old vci get version call --- CMakeLists.txt | 9 ++------- VERSION | 6 ------ cmake-library | 2 +- cmake/OpenMeshPackage.cmake | 8 ++++---- openmesh.pc.in | 2 +- src/OpenMesh/Core/CMakeLists.txt | 4 ++-- src/OpenMesh/Tools/CMakeLists.txt | 4 ++-- 7 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 VERSION 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) From a20be770e0021662bcb905c94ee231044ca3f37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Jan 2021 12:39:17 +0100 Subject: [PATCH 3/5] Raised minimal cmake version to avoid warnings --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d199df8..5efa3d46 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set (CMAKE_DEBUG_POSTFIX "d") include (VCICommon) # Disable package building when built as an external library -if(${PROJECT_NAME} MATCHES "OpenMesh") +if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") include(OpenMeshPackage) endif() @@ -83,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 ) @@ -115,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 @@ -147,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 From aab142f09462e055085b874a476be5ad5d641e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Jan 2021 12:59:43 +0100 Subject: [PATCH 4/5] Add path to eigen3 --- CI/Windows.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 2135932f..3d506a2b 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -120,7 +120,7 @@ IF EXIST %QT_INSTALL_PATH%\ ( ) -"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% .. +"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DEigen3_DIR="e:\libs\general\Eigen3.3.9\share\eigen3\cmake" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% .. %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD" @@ -142,7 +142,7 @@ mkdir build-debug cd build-debug -"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% .. +"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DEigen3_DIR="e:\libs\general\Eigen3.3.9\share\eigen3\cmake" -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% .. %VS_PATH% /Build "Debug" OpenMesh.sln /Project "ALL_BUILD" From e9e0b8f16bc196fde69896197521a0ece4e242ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Jan 2021 13:03:11 +0100 Subject: [PATCH 5/5] Updated changelog --- Doc/changelog.docu | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 24f358f1..eabdedaf 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -26,11 +26,16 @@ IO
  • STL Reader: Change stl reader behaviour on extension .stl , Don't check for the solid keyword explicitly
    • +
  • OM Writer: Removed debug output
Build System
  • Dropped 32-bit Windows continuous integration and artifact builds.
    • +
  • Removed the VERSION file and do it via cmakes project call) +
  • Switched to external cmake-library used by all of our projects now
    • +
  • Removed custom Eigen3 finder. Eigen3 has full cmake support. (You can point OpenMesh to eigen via -DEigen3_DIR="c:\" ) +
  • Added support for and fixed some issues with VS2019