mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

recognize source file extensions ".ccm", ".cxxm", and ".c++m" (#422)

Browse source 
* recognize source file extensions ".ccm", ".cxxm", and ".c++m"

cmake 3.27 release notes: The "CXX" language now treats source file
extensions ".ccm", ".cxxm", and ".c++m" as C++.

Signed-off-by: 15knots <11367029+15knots@users.noreply.github.com>
This commit is contained in:
15knots 2023-06-16 20:56:51 +02:00 • committed by GitHub
parent 04f67b14b8
commit 09728af3db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
View file

@ -2088,7 +2088,7 @@
</option> </option>
<inputType <inputType
sourceContentType="org.eclipse.cdt.core.cxxSource" sourceContentType="org.eclipse.cdt.core.cxxSource"
sources="c,C,cc,cxx,cpp,cp,CPP" sources="c,C,cc,cxx,cpp,cp,CPP,ccm,cxxm,c++m"
dependencyContentType="org.eclipse.cdt.core.cxxHeader" dependencyContentType="org.eclipse.cdt.core.cxxHeader"
dependencyExtensions="h,H,hpp,hh,hp,hxx,HPP,h++,tcc" dependencyExtensions="h,H,hpp,hh,hp,hxx,HPP,h++,tcc"
dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2" dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2"

2
core/org.eclipse.cdt.core/plugin.xml
View file

@ -615,7 +615,7 @@
<!-- declares a content type for C++ source files --> <!-- declares a content type for C++ source files -->
<content-type id="cxxSource" name="%cxxSourceName" <content-type id="cxxSource" name="%cxxSourceName"
base-type="org.eclipse.cdt.core.cSource" base-type="org.eclipse.cdt.core.cSource"
file-extensions="C,cpp,cxx,cc,c++" file-extensions="C,cpp,cxx,cc,c++,ccm,cxxm,c++m"
priority="high"/> priority="high"/>
<!-- declares a content type for C++ header files --> <!-- declares a content type for C++ header files -->
<content-type id="cxxHeader" name="%cxxHeaderName" <content-type id="cxxHeader" name="%cxxHeaderName"

2
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -1745,7 +1745,7 @@
point="org.eclipse.compare.contentMergeViewers"> point="org.eclipse.compare.contentMergeViewers">
<viewer <viewer
class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator" class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator"
extensions="c,cc,cxx,cpp,c++,h,hh,hxx,hpp,inc,c2" extensions="c,cc,cxx,cpp,c++,ccm,cxxm,c++m,h,hh,hxx,hpp,inc,c2"
id="org.eclipse.cdt.ui.compare.CContentViewerCreator"> id="org.eclipse.cdt.ui.compare.CContentViewerCreator">
</viewer> </viewer>
<contentTypeBinding <contentTypeBinding

2
jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
View file

@ -4,7 +4,7 @@ Bundle-Name: %bundleName
Bundle-Description: %bundleDescription Bundle-Description: %bundleDescription
Bundle-Copyright: %Bundle-Copyright Bundle-Copyright: %Bundle-Copyright
Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core;singleton:=true Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core;singleton:=true
Bundle-Version: 1.4.0.qualifier Bundle-Version: 1.4.100.qualifier
Bundle-Vendor: %Bundle-Vendor Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17

3
jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
View file

@ -492,6 +492,9 @@ public class CompileCommandsJsonParser {
case "cp": case "cp":
case "cxx": case "cxx":
case "c++": case "c++":
case "ccm":
case "cxxm":
case "c++m":
// make sure we run built-ins detection only once for C++ files.. // make sure we run built-ins detection only once for C++ files..
sourceFileExtension = "cpp"; sourceFileExtension = "cpp";
break; break;