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

<LANG>_COMPILER_LAUNCHER: Expand subset of genexes that can be evaluated

Browse Source
This commit is contained in:
Kyle Edwards
2023-02-02 11:37:30 -05:00
parent 063913f486
commit 84ada0b0c9
22 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefileTargetGenerator.cxx
+2 -1
View File
@@ -1044,7 +1044,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER"; std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop); cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
std::string evaluatedClauncher = cmGeneratorExpression::Evaluate( std::string evaluatedClauncher = cmGeneratorExpression::Evaluate(
*clauncher, this->LocalGenerator, config); *clauncher, this->LocalGenerator, config, this->GeneratorTarget,
nullptr, this->GeneratorTarget, lang);
if (!evaluatedClauncher.empty()) { if (!evaluatedClauncher.empty()) {
compilerLauncher = evaluatedClauncher; compilerLauncher = evaluatedClauncher;
} }
Source/cmNinjaTargetGenerator.cxx
+2 -1
View File
@@ -886,7 +886,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang,
std::string const clauncher_prop = cmStrCat(lang, "_COMPILER_LAUNCHER"); std::string const clauncher_prop = cmStrCat(lang, "_COMPILER_LAUNCHER");
cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop); cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
std::string evaluatedClauncher = cmGeneratorExpression::Evaluate( std::string evaluatedClauncher = cmGeneratorExpression::Evaluate(
*clauncher, this->LocalGenerator, config); *clauncher, this->LocalGenerator, config, this->GeneratorTarget, nullptr,
this->GeneratorTarget, lang);
if (!evaluatedClauncher.empty()) { if (!evaluatedClauncher.empty()) {
compilerLauncher = evaluatedClauncher; compilerLauncher = evaluatedClauncher;
} }
Tests/RunCMake/CompilerLauncher/C-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=C.*
Tests/RunCMake/CompilerLauncher/C-launch-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=C.*
Tests/RunCMake/CompilerLauncher/CUDA-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CUDA.*
Tests/RunCMake/CompilerLauncher/CUDA-launch-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CUDA.*
Tests/RunCMake/CompilerLauncher/CXX-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CXX.*
Tests/RunCMake/CompilerLauncher/CXX-launch-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CXX.*
Tests/RunCMake/CompilerLauncher/Fortran-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=Fortran.*
Tests/RunCMake/CompilerLauncher/Fortran-launch-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=Fortran.*
Tests/RunCMake/CompilerLauncher/HIP-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=HIP.*
Tests/RunCMake/CompilerLauncher/HIP-env-launch-Build-stdout.txt
-1
View File
@@ -1 +0,0 @@
.*-E env USED_LAUNCHER=1.*
Tests/RunCMake/CompilerLauncher/HIP-launch-env-Build-stdout.txt
+1
View File
@@ -0,0 +1 @@
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=HIP.*
Tests/RunCMake/CompilerLauncher/ISPC-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=ISPC.*
Tests/RunCMake/CompilerLauncher/ISPC-launch-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=ISPC.*
Tests/RunCMake/CompilerLauncher/OBJC-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJC.*
Tests/RunCMake/CompilerLauncher/OBJC-env-launch-Build-stdout.txt
-1
View File
@@ -1 +0,0 @@
.*-E env USED_LAUNCHER=1.*
Tests/RunCMake/CompilerLauncher/OBJC-launch-env-Build-stdout.txt
+1
View File
@@ -0,0 +1 @@
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJC.*
Tests/RunCMake/CompilerLauncher/OBJCXX-env-Build-stdout.txt
+1 -1
View File
@@ -1 +1 @@
.*-E env USED_LAUNCHER=1.* .*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJCXX.*
Tests/RunCMake/CompilerLauncher/OBJCXX-env-launch-Build-stdout.txt
-1
View File
@@ -1 +0,0 @@
.*-E env USED_LAUNCHER=1.*
Tests/RunCMake/CompilerLauncher/OBJCXX-launch-env-Build-stdout.txt
+1
View File
@@ -0,0 +1 @@
.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=OBJCXX.*
Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
+1 -1
View File
@@ -18,7 +18,7 @@ endfunction()
function(run_compiler_launcher_env lang) function(run_compiler_launcher_env lang)
string(REGEX REPLACE "-.*" "" core_lang "${lang}") string(REGEX REPLACE "-.*" "" core_lang "${lang}")
# Use the noop genexp $<PATH:...> genexp to validate genexp support. # 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}) run_compiler_launcher(${lang})
unset(ENV{CMAKE_${core_lang}_COMPILER_LAUNCHER}) unset(ENV{CMAKE_${core_lang}_COMPILER_LAUNCHER})
endfunction() endfunction()