mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 10:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'lang-linker-launcher-genex'

Browse Source 
33e27f6ca6 <LANG>_LINKER_LAUNCHER: Allow generator expressions
84ada0b0c9 <LANG>_COMPILER_LAUNCHER: Expand subset of genexes that can be evaluated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8152
This commit is contained in:
Brad King
2023-02-03 15:00:30 +00:00
committed by Kitware Robot
parent 82f61a20b4 33e27f6ca6
commit c3210aab46
37 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Help/prop_tgt/LANG_LINKER_LAUNCHER.rst
View File

@@ -14,3 +14,8 @@ arguments to the tool. This is useful for tools such as static analyzers.
This property is initialized by the value of the
:variable:`CMAKE_<LANG>_LINKER_LAUNCHER` variable if it is set when a target is
created.
.. versionadded:: 3.27
The property value may use
:manual:`generator expressions <cmake-generator-expressions(7)>`.

5
Help/release/dev/lang-linker-launcher-genex.rst Normal file
View File

@@ -0,0 +1,5 @@
lang-linker-launcher-genex
--------------------------
* The :prop_tgt:`<LANG>_LINKER_LAUNCHER` target property now supports
:manual:`generator expressions <cmake-generator-expressions(7)>`.

14
Source/cmCommonTargetGenerator.cxx
View File

@@ -10,6 +10,8 @@
#include <cmext/string_view>
#include "cmComputeLinkInformation.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorExpressionDAGChecker.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalCommonGenerator.h"
#include "cmGlobalGenerator.h"
@@ -288,11 +290,17 @@ std::string cmCommonTargetGenerator::GetLinkerLauncher(
const std::string& config)
{
std::string lang = this->GeneratorTarget->GetLinkerLanguage(config);
cmValue launcherProp =
this->GeneratorTarget->GetProperty(lang + "_LINKER_LAUNCHER");
std::string propName = lang + "_LINKER_LAUNCHER";
cmValue launcherProp = this->GeneratorTarget->GetProperty(propName);
if (cmNonempty(launcherProp)) {
cmGeneratorExpressionDAGChecker dagChecker(this->GeneratorTarget, propName,
nullptr, nullptr);
std::string evaluatedLinklauncher = cmGeneratorExpression::Evaluate(
*launcherProp, this->LocalCommonGenerator, config, this->GeneratorTarget,
&dagChecker, this->GeneratorTarget, lang);
// Convert ;-delimited list to single string
std::vector<std::string> args = cmExpandedList(*launcherProp, true);
std::vector<std::string> args =
cmExpandedList(evaluatedLinklauncher, true);
if (!args.empty()) {
args[0] = this->LocalCommonGenerator->ConvertToOutputFormat(
args[0], cmOutputConverter::SHELL);

9
Source/cmGeneratorExpressionDAGChecker.cxx
View File

@@ -177,6 +177,15 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingLinkOptionsExpression() const
return property == "LINK_OPTIONS"_s;
}
bool cmGeneratorExpressionDAGChecker::EvaluatingLinkerLauncher() const
{
cm::string_view property(this->Top()->Property);
return property.length() > cmStrLen("_LINKER_LAUNCHER") &&
property.substr(property.length() - cmStrLen("_LINKER_LAUNCHER")) ==
"_LINKER_LAUNCHER"_s;
}
bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(
cmGeneratorTarget const* tgt, ForGenex genex) const
{

1
Source/cmGeneratorExpressionDAGChecker.h
View File

@@ -70,6 +70,7 @@ struct cmGeneratorExpressionDAGChecker
bool EvaluatingCompileExpression() const;
bool EvaluatingLinkExpression() const;
bool EvaluatingLinkOptionsExpression() const;
bool EvaluatingLinkerLauncher() const;
enum class ForGenex
{

9
Source/cmGeneratorExpressionNode.cxx
View File

@@ -1548,7 +1548,8 @@ static const struct LinkLanguageNode : public cmGeneratorExpressionNode
{
if (!context->HeadTarget || !dagChecker ||
!(dagChecker->EvaluatingLinkExpression() ||
dagChecker->EvaluatingLinkLibraries())) {
dagChecker->EvaluatingLinkLibraries() ||
dagChecker->EvaluatingLinkerLauncher())) {
reportError(context, content->GetOriginalExpression(),
"$<LINK_LANGUAGE:...> may only be used with binary targets "
"to specify link libraries, link directories, link options "
@@ -1641,7 +1642,8 @@ static const struct LinkLanguageAndIdNode : public cmGeneratorExpressionNode
{
if (!context->HeadTarget || !dagChecker ||
!(dagChecker->EvaluatingLinkExpression() ||
dagChecker->EvaluatingLinkLibraries())) {
dagChecker->EvaluatingLinkLibraries() ||
dagChecker->EvaluatingLinkerLauncher())) {
reportError(
context, content->GetOriginalExpression(),
"$<LINK_LANG_AND_ID:lang,id> may only be used with binary targets "
@@ -2098,7 +2100,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (dagCheckerParent) {
if (dagCheckerParent->EvaluatingGenexExpression() ||
dagCheckerParent->EvaluatingPICExpression()) {
dagCheckerParent->EvaluatingPICExpression() ||
dagCheckerParent->EvaluatingLinkerLauncher()) {
// No check required.
} else if (dagCheckerParent->EvaluatingLinkLibraries()) {
evaluatingLinkLibraries = true;

3
Source/cmMakefileTargetGenerator.cxx
View File

@@ -1044,7 +1044,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
std::string evaluatedClauncher = cmGeneratorExpression::Evaluate(
*clauncher, this->LocalGenerator, config);
*clauncher, this->LocalGenerator, config, this->GeneratorTarget,
nullptr, this->GeneratorTarget, lang);
if (!evaluatedClauncher.empty()) {
compilerLauncher = evaluatedClauncher;
}

3
Source/cmNinjaTargetGenerator.cxx
View File

@@ -886,7 +886,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang,
std::string const clauncher_prop = cmStrCat(lang, "_COMPILER_LAUNCHER");
cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
std::string evaluatedClauncher = cmGeneratorExpression::Evaluate(
*clauncher, this->LocalGenerator, config);
*clauncher, this->LocalGenerator, config, this->GeneratorTarget, nullptr,
this->GeneratorTarget, lang);
if (!evaluatedClauncher.empty()) {
compilerLauncher = evaluatedClauncher;
}

2
Tests/RunCMake/CompilerLauncher/C-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=C.*

2
Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=C.*

2
Tests/RunCMake/CompilerLauncher/CUDA-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CUDA.*

2
Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CUDA.*

2
Tests/RunCMake/CompilerLauncher/CXX-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CXX.*

2
Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CXX.*

2
Tests/RunCMake/CompilerLauncher/Fortran-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=Fortran.*

2
Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=Fortran.*

2
Tests/RunCMake/CompilerLauncher/HIP-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=HIP.*

1
Tests/RunCMake/CompilerLauncher/HIP-env-launch-Build-stdout.txt
View File

@@ -1 +0,0 @@
.*-E env USED_LAUNCHER=1.*

1
Tests/RunCMake/CompilerLauncher/HIP-launch-env-Build-stdout.txt Normal file
View File

@@ -0,0 +1 @@
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=HIP.*

2
Tests/RunCMake/CompilerLauncher/ISPC-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=ISPC.*

2
Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=ISPC.*

2
Tests/RunCMake/CompilerLauncher/OBJC-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJC.*

1
Tests/RunCMake/CompilerLauncher/OBJC-env-launch-Build-stdout.txt
View File

@@ -1 +0,0 @@
.*-E env USED_LAUNCHER=1.*

1
Tests/RunCMake/CompilerLauncher/OBJC-launch-env-Build-stdout.txt Normal file
View File

@@ -0,0 +1 @@
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJC.*

2
Tests/RunCMake/CompilerLauncher/OBJCXX-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJCXX.*

1
Tests/RunCMake/CompilerLauncher/OBJCXX-env-launch-Build-stdout.txt
View File

@@ -1 +0,0 @@
.*-E env USED_LAUNCHER=1.*

1
Tests/RunCMake/CompilerLauncher/OBJCXX-launch-env-Build-stdout.txt Normal file
View File

@@ -0,0 +1 @@
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJCXX.*

2
Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
View File

@@ -18,7 +18,7 @@ endfunction()
function(run_compiler_launcher_env lang)
string(REGEX REPLACE "-.*" "" core_lang "${lang}")
# Use the noop genexp $<PATH:...> genexp to validate genexp support.
set(ENV{CMAKE_${core_lang}_COMPILER_LAUNCHER} "$<PATH:CMAKE_PATH,${CMAKE_COMMAND}>;-E;env;USED_LAUNCHER=1")
set(ENV{CMAKE_${core_lang}_COMPILER_LAUNCHER} "$<PATH:CMAKE_PATH,${CMAKE_COMMAND}>;-E;env;USED_LAUNCHER=1;TARGET_NAME=$<TARGET_PROPERTY:NAME>;LANGUAGE=$<COMPILE_LANGUAGE>")
run_compiler_launcher(${lang})
unset(ENV{CMAKE_${core_lang}_COMPILER_LAUNCHER})
endfunction()

2
Tests/RunCMake/LinkerLauncher/C-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=C.*

2
Tests/RunCMake/LinkerLauncher/C-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=C.*

2
Tests/RunCMake/LinkerLauncher/CXX-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CXX.*

2
Tests/RunCMake/LinkerLauncher/CXX-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CXX.*

2
Tests/RunCMake/LinkerLauncher/OBJC-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJC.*

2
Tests/RunCMake/LinkerLauncher/OBJC-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJC.*

2
Tests/RunCMake/LinkerLauncher/OBJCXX-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJCXX.*

2
Tests/RunCMake/LinkerLauncher/OBJCXX-launch-env-Build-stdout.txt
View File

@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.*
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJCXX.*

3
Tests/RunCMake/LinkerLauncher/RunCMakeTest.cmake
View File

@@ -17,7 +17,8 @@ endfunction()
function(run_linker_launcher_env lang)
string(REGEX REPLACE "-.*" "" core_lang "${lang}")
set(ENV{CMAKE_${core_lang}_LINKER_LAUNCHER} "${CMAKE_COMMAND};-E;env;USED_LAUNCHER=1")
# Use the noop genexp $<PATH:...> genexp to validate genexp support.
set(ENV{CMAKE_${core_lang}_LINKER_LAUNCHER} "$<PATH:CMAKE_PATH,${CMAKE_COMMAND}>;-E;env;USED_LAUNCHER=1;TARGET_NAME=$<TARGET_PROPERTY:NAME>;LANGUAGE=$<LINK_LANGUAGE>")
run_linker_launcher(${lang})
unset(ENV{CMAKE_${core_lang}_LINKER_LAUNCHER})
endfunction()