diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2022-12-14 18:44:52 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2022-12-15 23:43:47 (GMT) |
| commit | e84fcbcb0b7c33caf35fbdfde411e8636f4d31f9 (patch) | |
| tree | 332a054ac99340340fa00103c5eee72046569143 /Source | |
| parent | 5e35913382d0bbca6b843f6bbe2fd52fa47d32c9 (diff) | |
| download | CMake-e84fcbcb0b7c33caf35fbdfde411e8636f4d31f9.zip CMake-e84fcbcb0b7c33caf35fbdfde411e8636f4d31f9.tar.gz CMake-e84fcbcb0b7c33caf35fbdfde411e8636f4d31f9.tar.bz2 | |
cxxmodules: support new round of Clang patches
These patches now support the `-MF` output, so remove the `none` support
added just for the old patchset which did not use it.
Also update the flag name to `-fmodule-output=`.
Due to the new Clang module mapper flag, use a new experimental support
UUID as well.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCxxModuleMapper.cxx | 2 | ||||
| -rw-r--r-- | Source/cmExperimental.cxx | 2 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmCxxModuleMapper.cxx b/Source/cmCxxModuleMapper.cxx index ca4ffdf..cb37f2b 100644 --- a/Source/cmCxxModuleMapper.cxx +++ b/Source/cmCxxModuleMapper.cxx @@ -47,7 +47,7 @@ std::string CxxModuleMapContentClang(CxxModuleLocations const& loc, // extension. mm << "-x c++-module\n"; - mm << "-fsave-std-c++-module-file=" << *bmi_loc << '\n'; + mm << "-fmodule-output=" << *bmi_loc << '\n'; break; } } diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index bbb5840..c890e4b 100644 --- a/Source/cmExperimental.cxx +++ b/Source/cmExperimental.cxx @@ -27,7 +27,7 @@ struct FeatureData bool Warned; } LookupTable[] = { // CxxModuleCMakeApi - { "9629ab6c-6c0e-423f-bb9d-cc5ac4a22041", + { "2182bf5c-ef0d-489a-91da-49dbc3090d2a", "CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API", "CMake's C++ module support is experimental. It is meant only for " "experimentation and feedback to CMake developers.", diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 0807a98..6887376 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -562,9 +562,6 @@ cmNinjaRule GetScanRule( if (deptype == "msvc"_s) { rule.DepType = deptype; rule.DepFile.clear(); - } else if (deptype == "none"_s) { - rule.DepType.clear(); // no deps= for multiple outputs - rule.DepFile.clear(); } else { rule.DepType.clear(); // no deps= for multiple outputs rule.DepFile = "$DEP_FILE"; |