diff options
author | Brad King <brad.king@kitware.com> | 2021-01-07 13:26:21 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-07 13:26:28 (GMT) |
commit | 05f4248e3d89bf9d779140cf60f511126756ab02 (patch) | |
tree | 89ecb61830144a8885b2d7e79841d3d6784a6e23 /Source/cmake.cxx | |
parent | 520df2880b7f172371de5a6adc6d6ada0e45ac8d (diff) | |
parent | 39cbbb59a52c63cd90eebaecea64fd42c3fad1d8 (diff) | |
download | CMake-05f4248e3d89bf9d779140cf60f511126756ab02.zip CMake-05f4248e3d89bf9d779140cf60f511126756ab02.tar.gz CMake-05f4248e3d89bf9d779140cf60f511126756ab02.tar.bz2 |
Merge topic 'cpp-modules'
39cbbb59a5 ninja: add experimental infrastructure to generate gcc-format modmap files
791b4d26d6 ninja: add experimental infrastructure to generate modmap files with dyndep
4b23359117 ninja: Add experimental infrastructure for C++20 module dependency scanning
f814d3b3c6 cmNinjaTargetGenerator: use $OBJ_FILE for the object
b0fc2993e1 Treat the '.mpp' file extension as C++ code
988f997100 cmScanDepFormat: Fix name of our internal tool in parse errors
dacd93a2db ninja: De-duplicate version numbers required for ninja features
533386ca29 cmStandardLevelResolver: Factor out helper to capture stoi exceptions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Shannon Booth <shannon.ml.booth@gmail.com>
Merge-request: !5562
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r-- | Source/cmake.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d6360a7..48848a7 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -208,8 +208,9 @@ cmake::cmake(Role role, cmState::Mode mode) }; // The "c" extension MUST precede the "C" extension. - setupExts(this->CLikeSourceFileExtensions, - { "c", "C", "c++", "cc", "cpp", "cxx", "cu", "m", "M", "mm" }); + setupExts( + this->CLikeSourceFileExtensions, + { "c", "C", "c++", "cc", "cpp", "cxx", "cu", "mpp", "m", "M", "mm" }); setupExts(this->HeaderFileExtensions, { "h", "hh", "h++", "hm", "hpp", "hxx", "in", "txx" }); setupExts(this->CudaFileExtensions, { "cu" }); |