diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-01-07 12:40:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-09 16:35:23 (GMT) |
| commit | a05b9d42392c2aaa07ec5ff693ecb9cd7a6598ac (patch) | |
| tree | 2c9ef88b4fa8018a32b37e869cb79c783d14ff6a /Source | |
| parent | 6841059c12fbe8677b1f40d52420b679619f7d53 (diff) | |
| download | CMake-a05b9d42392c2aaa07ec5ff693ecb9cd7a6598ac.zip CMake-a05b9d42392c2aaa07ec5ff693ecb9cd7a6598ac.tar.gz CMake-a05b9d42392c2aaa07ec5ff693ecb9cd7a6598ac.tar.bz2 | |
ObjC: Add _COMPILE_LAUNCHER support
Fixes: #20178
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 767f4e0..dd8a389 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -733,8 +733,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles( // See if we need to use a compiler launcher like ccache or distcc std::string compilerLauncher; if (!compileCommands.empty() && - (lang == "C" || lang == "CXX" || lang == "Fortran" || - lang == "CUDA")) { + (lang == "C" || lang == "CXX" || lang == "Fortran" || lang == "CUDA" || + lang == "OBJC" || lang == "OBJCXX")) { std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER"; const char* clauncher = this->GeneratorTarget->GetProperty(clauncher_prop); diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 919a5db..0aab912 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -702,7 +702,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) // See if we need to use a compiler launcher like ccache or distcc std::string compilerLauncher; if (!compileCmds.empty() && - (lang == "C" || lang == "CXX" || lang == "Fortran" || lang == "CUDA")) { + (lang == "C" || lang == "CXX" || lang == "Fortran" || lang == "CUDA" || + lang == "OBJC" || lang == "OBJCXX")) { std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER"; const char* clauncher = this->GeneratorTarget->GetProperty(clauncher_prop); if (clauncher && *clauncher) { diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 2db89de..80986fc 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -333,6 +333,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, initProp("C_STANDARD"); initProp("C_STANDARD_REQUIRED"); initProp("C_EXTENSIONS"); + initProp("OBJC_COMPILER_LAUNCHER"); initProp("OBJC_STANDARD"); initProp("OBJC_STANDARD_REQUIRED"); initProp("OBJC_EXTENSIONS"); @@ -344,6 +345,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, initProp("CXX_STANDARD"); initProp("CXX_STANDARD_REQUIRED"); initProp("CXX_EXTENSIONS"); + initProp("OBJCXX_COMPILER_LAUNCHER"); initProp("OBJCXX_STANDARD"); initProp("OBJCXX_STANDARD_REQUIRED"); initProp("OBJCXX_EXTENSIONS"); |