mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'source_group-TREE-relative-path'

Browse Source 
4716f2be source_group: Restore TREE support for relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !852
This commit is contained in:
Brad King
2017-05-18 12:53:47 +00:00
committed by Kitware Robot
parent 21916a4784 4716f2be83
commit 10371cd6dc
6 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmSourceGroupCommand.cxx
View File

@@ -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>
#include <stddef.h>
@@ -16,7 +14,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)
{
@@ -80,17 +78,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;
}
@@ -229,13 +236,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;
@@ -254,13 +261,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;