diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-28 11:04:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-28 11:04:44 (GMT) |
| commit | a9490db79894f08cdff1e7e5c1a393c4a72631b2 (patch) | |
| tree | 98cf8f30ab0f4b2591f9911c6d4ce25e31257f84 | |
| parent | 1d39c1e27b39e2bc4f8b67de7e26827f80fe445b (diff) | |
| parent | c4d09fdc6d563570ef779244751e0088c83ea096 (diff) | |
| download | CMake-a9490db79894f08cdff1e7e5c1a393c4a72631b2.zip CMake-a9490db79894f08cdff1e7e5c1a393c4a72631b2.tar.gz CMake-a9490db79894f08cdff1e7e5c1a393c4a72631b2.tar.bz2 | |
Merge branch 'makefile-objc' into release-3.16
Merge-request: !4675
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 2 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 919fb74..6f2183d 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1457,7 +1457,7 @@ bool cmLocalUnixMakefileGenerator3::ScanDependencies( // Create the scanner for this language std::unique_ptr<cmDepends> scanner; if (lang == "C" || lang == "CXX" || lang == "RC" || lang == "ASM" || - lang == "CUDA") { + lang == "OBJC" || lang == "OBJCXX" || lang == "CUDA") { // TODO: Handle RC (resource files) dependencies correctly. scanner = cm::make_unique<cmDependsC>(this, targetDir, lang, &validDeps); } diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index dd8a389..9d08e07 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -666,8 +666,9 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles( // At the moment, it is assumed that C, C++, Fortran, and CUDA have both // assembly and preprocessor capabilities. The same is true for the // ability to export compile commands - bool lang_has_preprocessor = ((lang == "C") || (lang == "CXX") || - (lang == "Fortran") || (lang == "CUDA")); + bool lang_has_preprocessor = + ((lang == "C") || (lang == "CXX") || (lang == "OBJC") || + (lang == "OBJCXX") || (lang == "Fortran") || (lang == "CUDA")); bool const lang_has_assembly = lang_has_preprocessor; bool const lang_can_export_cmds = lang_has_preprocessor; |