Merge branch 'future' into jani_support

Former-commit-id: a62a04e844 [formerly e0b922ea93]
Former-commit-id: 672c1644fa

resources/cmake/macros/RegisterSourceGroup.cmake

@@ -1,13 +1,11 @@
 macro(register_source_groups_from_filestructure list_of_files)
     foreach(FILE ${list_of_files})
-        message(${FILE})
         get_filename_component(PARENT_DIR "${FILE}" PATH)
 
         # skip src or include and changes /'s to \\'s
         string(REPLACE ${PROJECT_SOURCE_DIR} "" PARENT_DIR "${PARENT_DIR}")
         string(REGEX REPLACE "(\\./)?(src|include)/?" "" GROUP "${PARENT_DIR}")
         string(REPLACE "/" "\\" GROUP "${GROUP}")
-        message(${GROUP})
 
         # group into "Source Files" and "Header Files"
         # if ("${FILE}" MATCHES ".*\\.cpp")