From 9202308922ae4c9047d4a2a63778d161c2e747e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 23 Feb 2022 13:05:55 +0100 Subject: [PATCH 1/3] Moved inl file to hh --- src/OpenMesh/Core/CMakeLists.txt | 14 +------------- src/OpenMesh/Core/IO/SR_binary_spec.hh | 2 +- ...tor_of_bool.inl => SR_binary_vector_of_bool.hh} | 0 3 files changed, 2 insertions(+), 14 deletions(-) rename src/OpenMesh/Core/IO/{SR_binary_vector_of_bool.inl => SR_binary_vector_of_bool.hh} (100%) diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt index 832e2ff0..ab741c44 100644 --- a/src/OpenMesh/Core/CMakeLists.txt +++ b/src/OpenMesh/Core/CMakeLists.txt @@ -22,6 +22,7 @@ IO/OMFormatT_impl.hh IO/Options.hh IO/SR_binary.hh IO/SR_binary_spec.hh +IO/SR_binary_vector_of_bool.hh IO/SR_rbo.hh IO/SR_store.hh IO/SR_types.hh @@ -244,19 +245,6 @@ install(DIRECTORY . #install the config file install(FILES System/config.h DESTINATION include/OpenMesh/Core/System) -#install inlined Files from IO -install(DIRECTORY IO/ - DESTINATION include/OpenMesh/Core/IO - FILES_MATCHING - PATTERN "*.inl" - PATTERN "CVS" EXCLUDE - PATTERN ".svn" EXCLUDE - PATTERN "reader" EXCLUDE - PATTERN "writer" EXCLUDE - PATTERN "importer" EXCLUDE - PATTERN "exporter" EXCLUDE - PATTERN "tmp" EXCLUDE - PATTERN "Debian*" EXCLUDE ) endif () install(TARGETS OpenMeshCore EXPORT OpenMeshConfig diff --git a/src/OpenMesh/Core/IO/SR_binary_spec.hh b/src/OpenMesh/Core/IO/SR_binary_spec.hh index 2e8a34c0..014c11fc 100644 --- a/src/OpenMesh/Core/IO/SR_binary_spec.hh +++ b/src/OpenMesh/Core/IO/SR_binary_spec.hh @@ -424,7 +424,7 @@ struct binary< std::vector< T >, typename std::enable_if +#include // ---------------------------------------------------------------------------- diff --git a/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl b/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.hh similarity index 100% rename from src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl rename to src/OpenMesh/Core/IO/SR_binary_vector_of_bool.hh From cd26cd20e0a388ee70a69c266ce6451071d5180c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 23 Feb 2022 13:25:25 +0100 Subject: [PATCH 2/3] Removed duplicate cmake code Prefer GLVND OpenGL --- src/OpenMesh/Apps/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index ebf10ff9..59dca6ae 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -37,6 +37,8 @@ if ( BUILD_APPS ) endif() + set( OpenGL_GL_PREFERENCE GLVND) + # find needed packages for gui applications find_package (OpenGL) @@ -70,17 +72,12 @@ if ( BUILD_APPS ) # Add ui apps as dependency before fixbundle - if ( WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") + # Required on Windows (NOTMINGW) and APPLE + if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") ) # let bundle generation depend on all targets add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer) endif() - # Add ui apps as dependency before fixbundle - if ( APPLE) - # let bundle generation depend on all targets - add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer) - endif() - if ( WIN32 ) FILE(GLOB files_install_app_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" ) INSTALL(FILES ${files_install_app_dlls} DESTINATION . ) From 6e17383b4942a24aa53c2da6f155d1e4425d19ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 23 Feb 2022 13:27:46 +0100 Subject: [PATCH 3/3] Removed some duplicate code --- src/OpenMesh/Apps/CMakeLists.txt | 13 ++----------- src/OpenMesh/Core/CMakeLists.txt | 10 +--------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index 59dca6ae..787a1734 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -23,20 +23,11 @@ if ( BUILD_APPS ) add_subdirectory (VDProgMesh/Analyzer) # Add non ui apps as dependency before fixbundle - if ( WIN32 ) - if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) - # let bundle generation depend on all targets + if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) ) + # let bundle generation depend on all targets add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer ) - endif() endif() - # Add non ui apps as dependency before fixbundle - if ( APPLE) - # let bundle generation depend on all targets - add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer ) - endif() - - set( OpenGL_GL_PREFERENCE GLVND) # find needed packages for gui applications diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt index ab741c44..48f55474 100644 --- a/src/OpenMesh/Core/CMakeLists.txt +++ b/src/OpenMesh/Core/CMakeLists.txt @@ -172,18 +172,10 @@ endif () # Add core as dependency before fixbundle if ( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) - if ( WIN32 ) - if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) + if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) ) add_dependencies (fixbundle OpenMeshCore) - endif() endif() - # Add core as dependency before fixbundle - if ( APPLE ) - # let bundle generation depend on targets - add_dependencies (fixbundle OpenMeshCore) - endif () - endif() # if we build debug and release in the same dir, we want to install both!