Merge pull request #2019 from CastagnaIT/folder_view_fix

[cmake] Use source_group TREE on source_group_by_folder

Author: CastagnaIT

Helpers.cmake

@@ -27,22 +27,27 @@ function(source_group_by_folder target)
     endif()
   endif()
   foreach(file ${files})
+    if(file MATCHES "^\\$<")
+      list(POP_FRONT files)
+      continue()
+    endif()
+
     if(NOT IS_ABSOLUTE ${file})
       set(file ${CMAKE_CURRENT_SOURCE_DIR}/${file})
     endif()
     file(RELATIVE_PATH relative_file ${relative_dir} ${file})
     get_filename_component(dir "${relative_file}" DIRECTORY)
     if(NOT dir STREQUAL "${last_dir}")
       if(files)
-        source_group("${last_dir}" FILES ${files})
+        source_group(TREE "${relative_dir}" FILES ${files})
       endif()
       set(files "")
     endif()
     set(files ${files} ${file})
     set(last_dir "${dir}")
   endforeach(file)
   if(files)
-    source_group("${last_dir}" FILES ${files})
+    source_group(TREE "${relative_dir}" FILES ${files})
   endif()
 endfunction()