source_group: Restore TREE support for relative paths

The fix in commit v3.8.1~4^2 (source_group: Fix TREE with root that is
not current source dir, 2017-04-20) accidentally broke support for
specifying paths relative to the source directory.  Fix it and add a
test covering the case.

While at it, fix a typo in a variable name.

Fixes: #16876

6 files changed, 39 insertions, 23 deletions

diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 23048bf16a..d72295471b 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -2,8 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmSourceGroupCommand.h"
 
-#include <algorithm>
-#include <iterator>
 #include <set>
 #include <sstream>
 
@@ -15,7 +13,7 @@ namespace {
 const size_t RootIndex = 1;
 const size_t FilesWithoutPrefixKeywordIndex = 2;
 const size_t FilesWithPrefixKeywordIndex = 4;
-const size_t PrefixKeywordIdex = 2;
+const size_t PrefixKeywordIndex = 2;
 
 std::vector<std::string> tokenizePath(const std::string& path)
 {
@@ -79,17 +77,26 @@ cmSourceGroup* addSourceGroup(const std::vector<std::string>& tokenizedPath,
   return sg;
 }
 
-std::string prepareFilePathForTree(const std::string& path)
+std::string prepareFilePathForTree(const std::string& path,
+                                   const std::string& currentSourceDir)
 {
+  if (!cmSystemTools::FileIsFullPath(path)) {
+    return cmSystemTools::CollapseFullPath(currentSourceDir + "/" + path);
+  }
   return cmSystemTools::CollapseFullPath(path);
 }
 
 std::vector<std::string> prepareFilesPathsForTree(
   std::vector<std::string>::const_iterator begin,
-  std::vector<std::string>::const_iterator end)
+  std::vector<std::string>::const_iterator end,
+  const std::string& currentSourceDir)
 {
-  std::vector<std::string> prepared(std::distance(begin, end));
-  std::transform(begin, end, prepared.begin(), prepareFilePathForTree);
+  std::vector<std::string> prepared;
+
+  for (; begin != end; ++begin) {
+    prepared.push_back(prepareFilePathForTree(*begin, currentSourceDir));
+  }
+
   return prepared;
 }
 
@@ -228,13 +235,13 @@ bool cmSourceGroupCommand::checkTreeArgumentsPreconditions(
   }
 
   if (args[FilesWithoutPrefixKeywordIndex] != "FILES" &&
-      args[PrefixKeywordIdex] != "PREFIX") {
+      args[PrefixKeywordIndex] != "PREFIX") {
     errorMsg = "Unknown argument \"" + args[2] +
       "\". Perhaps the FILES keyword is missing.\n";
     return false;
   }
 
-  if (args[PrefixKeywordIdex] == "PREFIX" &&
+  if (args[PrefixKeywordIndex] == "PREFIX" &&
       (args.size() < 5 || args[FilesWithPrefixKeywordIndex] != "FILES")) {
     errorMsg = "Missing FILES arguments.";
     return false;
@@ -253,13 +260,14 @@ bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
   const std::string root = cmSystemTools::CollapseFullPath(args[RootIndex]);
   std::string prefix;
   size_t filesBegin = FilesWithoutPrefixKeywordIndex + 1;
-  if (args[PrefixKeywordIdex] == "PREFIX") {
-    prefix = args[PrefixKeywordIdex + 1];
+  if (args[PrefixKeywordIndex] == "PREFIX") {
+    prefix = args[PrefixKeywordIndex + 1];
     filesBegin = FilesWithPrefixKeywordIndex + 1;
   }
 
   const std::vector<std::string> filesVector =
-    prepareFilesPathsForTree(args.begin() + filesBegin, args.end());
+    prepareFilesPathsForTree(args.begin() + filesBegin, args.end(),
+                             this->Makefile->GetCurrentSourceDirectory());
 
   if (!rootIsPrefix(root, filesVector, errorMsg)) {
     return false;
diff --git a/Tests/SourceGroups/CMakeLists.txt b/Tests/SourceGroups/CMakeLists.txt
index 9289e8444e..4e4a030ce8 100644
--- a/Tests/SourceGroups/CMakeLists.txt
+++ b/Tests/SourceGroups/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.8)
 project(SourceGroups)
 
 # this is not really a test which can fail
@@ -33,10 +33,11 @@ source_group(EmptyGroup)
 set(root ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(tree_files_without_prefix ${root}/sub1/tree_bar.c
-                              ${root}/sub1/tree_baz.c
-                              ${root}/sub1/tree_subdir/tree_foobar.c)
+                              sub1/tree_baz.c
+                              sub1/../sub1/tree_subdir/tree_foobar.c)
 
-set(tree_files_with_prefix ${root}/tree_foo.c)
+set(tree_files_with_prefix ${root}/tree_prefix_foo.c
+                           tree_prefix_bar.c)
 
 source_group(TREE ${root} FILES ${tree_files_without_prefix})
 
diff --git a/Tests/SourceGroups/main.c b/Tests/SourceGroups/main.c
index b88f2f8b3b..4d84cf20e3 100644
--- a/Tests/SourceGroups/main.c
+++ b/Tests/SourceGroups/main.c
@@ -5,7 +5,8 @@ extern int bar(void);
 extern int foobar(void);
 extern int barbar(void);
 extern int baz(void);
-extern int tree_foo(void);
+extern int tree_prefix_foo(void);
+extern int tree_prefix_bar(void);
 extern int tree_bar(void);
 extern int tree_foobar(void);
 extern int tree_baz(void);
@@ -15,7 +16,9 @@ int main()
   printf("foo: %d bar: %d foobar: %d barbar: %d baz: %d\n", foo(), bar(),
          foobar(), barbar(), baz());
 
-  printf("tree_foo: %d tree_bar: %d tree_foobar: %d tree_baz: %d\n",
-         tree_foo(), tree_bar(), tree_foobar(), tree_baz());
+  printf("tree_prefix_foo: %d tree_prefix_bar: %d tree_bar: %d tree_foobar: "
+         "%d tree_baz: %d\n",
+         tree_prefix_foo(), tree_prefix_bar(), tree_bar(), tree_foobar(),
+         tree_baz());
   return 0;
 }
diff --git a/Tests/SourceGroups/tree_foo.c b/Tests/SourceGroups/tree_foo.c
deleted file mode 100644
index d392e41fd3..0000000000
--- a/Tests/SourceGroups/tree_foo.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int tree_foo(void)
-{
-  return 6;
-}
diff --git a/Tests/SourceGroups/tree_prefix_bar.c b/Tests/SourceGroups/tree_prefix_bar.c
new file mode 100644
index 0000000000..bd98476ae8
--- /dev/null
+++ b/Tests/SourceGroups/tree_prefix_bar.c
@@ -0,0 +1,4 @@
+int tree_prefix_bar(void)
+{
+  return 66;
+}
diff --git a/Tests/SourceGroups/tree_prefix_foo.c b/Tests/SourceGroups/tree_prefix_foo.c
new file mode 100644
index 0000000000..92c2fd71eb
--- /dev/null
+++ b/Tests/SourceGroups/tree_prefix_foo.c
@@ -0,0 +1,4 @@
+int tree_prefix_foo(void)
+{
+  return 6;
+}