reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-04 09:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fileapi: add backtraces for LINK_PATH and LINK_DIRECTORIES

Browse Source
This commit is contained in:
Justin Goshi 2019-09-11 11:37:48 -07:00 committed by Brad King
parent 5bd65dff7a
commit 4d6334824d
5 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmFileAPICodemodel.cxx
View File

@ -1270,8 +1270,8 @@ Json::Value Target::DumpLinkCommandFragments()
std::string linkLanguageFlags;
std::vector<BT<std::string>> linkFlags;
std::string frameworkPath;
std::string linkPath;
std::string linkLibs;
std::vector<BT<std::string>> linkPath;
std::vector<BT<std::string>> linkLibs;
cmLocalGenerator* lg = this->GT->GetLocalGenerator();
cmLinkLineComputer linkLineComputer(lg,
lg->GetStateSnapshot().GetDirectory());
@ -1280,8 +1280,6 @@ Json::Value Target::DumpLinkCommandFragments()
this->GT);
linkLanguageFlags = cmTrimWhitespace(linkLanguageFlags);
frameworkPath = cmTrimWhitespace(frameworkPath);
linkPath = cmTrimWhitespace(linkPath);
linkLibs = cmTrimWhitespace(linkLibs);
if (!linkLanguageFlags.empty()) {
linkFragments.append(
@ -1302,13 +1300,19 @@ Json::Value Target::DumpLinkCommandFragments()
}
if (!linkPath.empty()) {
linkFragments.append(
this->DumpCommandFragment(std::move(linkPath), "libraryPath"));
for (BT<std::string> frag : linkPath) {
frag.Value = cmTrimWhitespace(frag.Value);
linkFragments.append(
this->DumpCommandFragment(this->ToJBT(frag), "libraryPath"));
}
}
if (!linkLibs.empty()) {
linkFragments.append(
this->DumpCommandFragment(std::move(linkLibs), "libraries"));
for (BT<std::string> frag : linkLibs) {
frag.Value = cmTrimWhitespace(frag.Value);
linkFragments.append(
this->DumpCommandFragment(this->ToJBT(frag), "libraries"));
}
}
return linkFragments;

16
Source/cmLocalGenerator.cxx
View File

@ -1198,17 +1198,21 @@ void cmLocalGenerator::GetTargetFlags(
std::string& linkLibs, std::string& flags, std::string& linkFlags,
std::string& frameworkPath, std::string& linkPath, cmGeneratorTarget* target)
{
std::vector<BT<std::string>> tmpLinkFlags;
this->GetTargetFlags(linkLineComputer, config, linkLibs, flags, tmpLinkFlags,
frameworkPath, linkPath, target);
this->AppendFlags(linkFlags, tmpLinkFlags);
std::vector<BT<std::string>> linkFlagsList;
std::vector<BT<std::string>> linkPathList;
std::vector<BT<std::string>> linkLibsList;
this->GetTargetFlags(linkLineComputer, config, linkLibsList, flags,
linkFlagsList, frameworkPath, linkPathList, target);
this->AppendFlags(linkFlags, linkFlagsList);
this->AppendFlags(linkPath, linkPathList);
this->AppendFlags(linkLibs, linkLibsList);
}
void cmLocalGenerator::GetTargetFlags(
cmLinkLineComputer* linkLineComputer, const std::string& config,
std::string& linkLibs, std::string& flags,
std::vector<BT<std::string>>& linkLibs, std::string& flags,
std::vector<BT<std::string>>& linkFlags, std::string& frameworkPath,
std::string& linkPath, cmGeneratorTarget* target)
std::vector<BT<std::string>>& linkPath, cmGeneratorTarget* target)
{
const std::string buildType = cmSystemTools::UpperCase(config);
cmComputeLinkInformation* pcli = target->GetLinkInformation(config);

11
Source/cmLocalGenerator.h
View File

@ -382,12 +382,11 @@ public:
std::string& flags, std::string& linkFlags,
std::string& frameworkPath, std::string& linkPath,
cmGeneratorTarget* target);
void GetTargetFlags(cmLinkLineComputer* linkLineComputer,
const std::string& config, std::string& linkLibs,
std::string& flags,
std::vector<BT<std::string>>& linkFlags,
std::string& frameworkPath, std::string& linkPath,
cmGeneratorTarget* target);
void GetTargetFlags(
cmLinkLineComputer* linkLineComputer, const std::string& config,
std::vector<BT<std::string>>& linkLibs, std::string& flags,
std::vector<BT<std::string>>& linkFlags, std::string& frameworkPath,
std::vector<BT<std::string>>& linkPath, cmGeneratorTarget* target);
void GetTargetDefines(cmGeneratorTarget const* target,
std::string const& config, std::string const& lang,
std::set<std::string>& defines) const;

40
Tests/RunCMake/FileAPI/codemodel-v2-check.py
View File

@ -249,13 +249,13 @@ def check_target(c):
if expected["backtrace"] is not None:
expected_keys.append("backtrace")
assert actual["fragment"] == expected["fragment"]
assert matches(actual["fragment"], expected["fragment"])
assert actual["role"] == expected["role"]
check_backtrace(obj, actual["backtrace"], expected["backtrace"])
assert sorted(actual.keys()) == sorted(expected_keys)
check_list_match(lambda a, e: is_string(a["fragment"], e["fragment"]),
check_list_match(lambda a, e: matches(a["fragment"], e["fragment"]),
obj["link"]["commandFragments"], expected["link"]["commandFragments"],
check=check_link_command_fragments,
check_exception=lambda a, e: "Link fragment: %s" % a["fragment"],
@ -2218,6 +2218,42 @@ def gen_check_targets(c, g, inSource):
},
],
},
{
"fragment" : ".*TargetLinkDir\\\"?$",
"role" : "libraryPath",
"backtrace": [
{
"file": "^cxx/CMakeLists\\.txt$",
"line": 19,
"command": "target_link_directories",
"hasParent": True,
},
{
"file" : "^cxx/CMakeLists\\.txt$",
"line": None,
"command": None,
"hasParent": False,
},
],
},
{
"fragment" : ".*cxx_lib.*",
"role" : "libraries",
"backtrace": [
{
"file": "^cxx/CMakeLists\\.txt$",
"line": 6,
"command": "target_link_libraries",
"hasParent": True,
},
{
"file" : "^cxx/CMakeLists\\.txt$",
"line": None,
"command": None,
"hasParent": False,
},
],
},
],
},
"archive": None,

1
Tests/RunCMake/FileAPI/cxx/CMakeLists.txt
View File

@ -16,3 +16,4 @@ target_link_libraries(cxx_static_exe PRIVATE cxx_static_lib)
target_compile_options(cxx_exe PUBLIC TargetCompileOptions)
target_link_options(cxx_exe PUBLIC TargetLinkOptions)
target_link_directories(cxx_exe PUBLIC "${CMAKE_BINARY_DIR}/TargetLinkDir")