Merge branch 'master' into warnings

ACG/CMakeLists.txt

@@ -86,6 +86,7 @@ set (directories
   Geometry
   Config
   Geometry/Types
+  Geometry/bsp
   GL
   Glut
   IO

CMakeLists.txt

@@ -79,6 +79,22 @@ include (MSVCMacros)
 
 acg_get_version (OpenFlipper)
 
+# ========================================================================
+# qtcrator workaround for missing files in project
+# ========================================================================
+
+# qtcreator (4.0.3) does not include some header files and *T.cc in its
+# project structure. The issue is well-known, this is a workaround.
+# Unfortunately I could not find a workaround that does not involve adding
+# a dummy target that is visible in the target list.
+
+# To force adding files to the project structure, use
+# target_sources(_qtcreator_add_files PUBLIC ${EXTRA_FILES})
+# in your CMakeLists.txt templates of the form (*T.cc) are added automatically
+
+add_library(_qtcreator_add_files CMakeLists.txt) # dummy file that always exists
+set_target_properties(_qtcreator_add_files PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
+
 # ========================================================================
 # Branding 
 # ========================================================================

cmake/ACGCommon.cmake

@@ -279,6 +279,9 @@ macro (acg_drop_templates list)
   foreach (_file ${${list}})
     if (_file MATCHES "T.cc$")
       list (REMOVE_ITEM ${list} ${_file})
+
+      # Append removed sources to a dummy target to make them available in qtcreator
+      target_sources(_qtcreator_add_files PUBLIC ${_file})
     endif ()
   endforeach ()
 endmacro ()

OpenMesh @ 22554e00

-Subproject commit 1430552372e3e4e312a81b10371b07812ee603b7
+Subproject commit 22554e000ae7b79d6bd1cf4f90de74fd922c1359