cmBuildDatabase: fix language comparison for visibility Only C++ sources need checked for `CXX_MODULES` file set types, not the other way around.
diff --git a/Source/cmBuildDatabase.cxx b/Source/cmBuildDatabase.cxx index 9770587..90c281f 100644 --- a/Source/cmBuildDatabase.cxx +++ b/Source/cmBuildDatabase.cxx
@@ -447,7 +447,7 @@ bool isCXXModule = false; bool isPrivate = true; - if (sf->GetLanguage() != "CXX"_s) { + if (sf->GetLanguage() == "CXX"_s) { auto const* fs = gt->GetFileSetForSource(config, sf); if (fs && fs->GetType() == "CXX_MODULES"_s) { isCXXModule = true;
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json index e1603be..b7b9c03 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" }, @@ -285,7 +285,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json index 440bc4e..e08ee35 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json index 8877165..df5308f 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json index 8877165..df5308f 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json index 0a27fec..4a3a439 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" }, @@ -285,7 +285,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json index 8877165..df5308f 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json index 2fdaef5..a1817d4 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json
@@ -180,7 +180,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" }, @@ -263,7 +263,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json index cb3b3a2..42d934b 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json
@@ -127,7 +127,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json index cb3b3a2..42d934b 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json
@@ -127,7 +127,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json index cb3b3a2..42d934b 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json
@@ -127,7 +127,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json index 2fdaef5..a1817d4 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json
@@ -180,7 +180,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" }, @@ -263,7 +263,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json index cb3b3a2..42d934b 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json
@@ -127,7 +127,7 @@ "-Dtarget_interface_option" ], "object": "PATH:CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<IGNORE>" },
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json index 440bc4e..e08ee35 100644 --- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json +++ b/Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json
@@ -138,7 +138,7 @@ "-Dfrom_source_option" ], "object": "PATH:CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>", - "private": true, + "private": false, "provides": { "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>" },