Merge branch 'cmake_jan' into 'master'

Removed duplicate cmake code

See merge request OpenMesh/OpenMesh!317

src/OpenMesh/Apps/CMakeLists.txt

@@ -23,19 +23,12 @@ 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
-	add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
-      endif()
-    endif()
-
-    # Add non ui apps as dependency before fixbundle
-    if ( APPLE)
+    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()
 
+    set( OpenGL_GL_PREFERENCE GLVND)
 
     # find needed packages for gui applications
     find_package (OpenGL)
@@ -70,13 +63,8 @@ if ( BUILD_APPS )
 			    
 
       # Add ui apps as dependency before fixbundle 
-      if ( 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)
+      # 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()

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
@@ -171,17 +172,9 @@ 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()
 
@@ -244,19 +237,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

src/OpenMesh/Core/IO/SR_binary_spec.hh

@@ -424,7 +424,7 @@ struct binary< std::vector< T >, typename std::enable_if<std::is_default_constru
   }
 };
 
-#include <OpenMesh/Core/IO/SR_binary_vector_of_bool.inl>
+#include <OpenMesh/Core/IO/SR_binary_vector_of_bool.hh>
 
 // ----------------------------------------------------------------------------