Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

cmBuildDatabase: fix language comparison for visibility

Browse Source 
Only C++ sources need checked for `CXX_MODULES` file set types, not the
other way around.
This commit is contained in:
Ben Boeckel
2024-09-18 13:09:18 -04:00
parent 5120987bc3
commit 7ca4ac8e13
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmBuildDatabase.cxx
View File

@@ -447,7 +447,7 @@ cmBuildDatabase cmBuildDatabase::ForTarget(cmGeneratorTarget* gt,
bool isCXXModule = false; bool isCXXModule = false;
bool isPrivate = true; bool isPrivate = true;
if (sf->GetLanguage() != "CXX"_s) { if (sf->GetLanguage() == "CXX"_s) {
auto const* fs = gt->GetFileSetForSource(config, sf); auto const* fs = gt->GetFileSetForSource(config, sf);
if (fs && fs->GetType() == "CXX_MODULES"_s) { if (fs && fs->GetType() == "CXX_MODULES"_s) {
isCXXModule = true; isCXXModule = true;

4
Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },
@@ -285,7 +285,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>" "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },

4
Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },
@@ -285,7 +285,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>" "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },

4
Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json
View File

@@ -180,7 +180,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },
@@ -263,7 +263,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json
View File

@@ -127,7 +127,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json
View File

@@ -127,7 +127,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json
View File

@@ -127,7 +127,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },

4
Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json
View File

@@ -180,7 +180,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },
@@ -263,7 +263,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json
View File

@@ -127,7 +127,7 @@
"-Dtarget_interface_option" "-Dtarget_interface_option"
], ],
"object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<IGNORE>" "importable": "<IGNORE>"
}, },

2
Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json
View File

@@ -138,7 +138,7 @@
"-Dfrom_source_option" "-Dfrom_source_option"
], ],
"object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
"private": true, "private": false,
"provides": { "provides": {
"importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
}, },