diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst index 49b348f3ea..7f0fc01387 100644 --- a/Help/manual/cmake-file-api.7.rst +++ b/Help/manual/cmake-file-api.7.rst @@ -1626,12 +1626,23 @@ with members: the source is :prop_sf:`GENERATED`. ``fileSetIndex`` + .. deprecated:: 4.4 + Use the ``fileSetIndexes`` field instead, which is an array, and + accounts for sources assigned to multiple file sets. + Optional member that is present when the source is part of a file set. The value is an unsigned integer 0-based index into the ``fileSets`` - array. + array representing the file set to which the source was most recently added. This field was added in codemodel version 2.5. + ``fileSetIndexes`` + Optional member that is present when the source is part of at least one + file set; see also policy :policy:`CMP0211`. The value is + an array of unsigned integer 0-based indexes inte the ``fileSets`` array. + + This field was added in codemodel version 2.11. + ``backtrace`` Optional member that is present when a CMake language backtrace to the :command:`target_sources`, :command:`add_executable`, @@ -1663,9 +1674,20 @@ with members: the source is :prop_sf:`GENERATED`. ``fileSetIndex`` + .. deprecated:: 4.4 + Use the ``fileSetIndexes`` field instead, which is an array, and + accounts for sources assigned to multiple file sets. + Optional member that is present when the source is part of a file set. The value is an unsigned integer 0-based index into the ``fileSets`` - array. + array representing the file set to which the source was most recently added. + + ``fileSetIndexes`` + Optional member that is present when the source is part of at least one + file set; see also policy :policy:`CMP0211`. The value is + an array of unsigned integer 0-based indexes inte the ``fileSets`` array. + + This field was added in codemodel version 2.11. This field was added in codemodel version 2.10. diff --git a/Help/manual/file_api/schema_target.json b/Help/manual/file_api/schema_target.json index 925c25999e..fc25c054f2 100644 --- a/Help/manual/file_api/schema_target.json +++ b/Help/manual/file_api/schema_target.json @@ -648,6 +648,14 @@ "minimum": 0, "description": "Index into the fileSets array. Only present if the file is part of a file set." }, + "sourcesFileSetIndexesV2_11": { + "type": "array", + "description": "Indexes into the fileSets array. Only present if the file is part of a file set.", + "items": { + "type": "integer", + "minimum": 0 + } + }, "sourcesV2_0": { "type": "array", "items": { @@ -705,6 +713,39 @@ "additionalProperties": false } }, + "sourcesV2_11": { + "type": "array", + "items": { + "type": "object", + "required": [ + "path" + ], + "properties": { + "path": { + "$ref": "#/definitions/sourcesPath" + }, + "compileGroupIndex": { + "$ref": "#/definitions/sourcesCompileGroupIndex" + }, + "sourceGroupIndex": { + "$ref": "#/definitions/sourcesSourceGroupIndex" + }, + "isGenerated": { + "$ref": "#/definitions/sourcesIsGenerated" + }, + "backtrace": { + "$ref": "#/definitions/backtrace" + }, + "fileSetIndex": { + "$ref": "#/definitions/sourcesFileSetIndexV2_5" + }, + "fileSetIndexes": { + "$ref": "#/definitions/sourcesFileSetIndexesV2_11" + } + }, + "additionalProperties": false + } + }, "interfaceSourcesV2_10": { "type": "array", "items": { @@ -729,6 +770,33 @@ "additionalProperties": false } }, + "interfaceSourcesV2_11": { + "type": "array", + "items": { + "type": "object", + "required": [ + "path" + ], + "properties": { + "path": { + "$ref": "#/definitions/sourcesPath" + }, + "sourceGroupIndex": { + "$ref": "#/definitions/sourcesSourceGroupIndex" + }, + "isGenerated": { + "$ref": "#/definitions/sourcesIsGenerated" + }, + "fileSetIndex": { + "$ref": "#/definitions/sourcesFileSetIndexV2_5" + }, + "fileSetIndexes": { + "$ref": "#/definitions/sourcesFileSetIndexesV2_11" + } + }, + "additionalProperties": false + } + }, "sourceGroupsV2_0": { "type": "array", "items": { @@ -1922,10 +1990,10 @@ "$ref": "#/definitions/fileSetsV2_11" }, "sources": { - "$ref": "#/definitions/sourcesV2_5" + "$ref": "#/definitions/sourcesV2_11" }, "interfaceSources": { - "$ref": "#/definitions/interfaceSourcesV2_10" + "$ref": "#/definitions/interfaceSourcesV2_11" }, "symbolic": { "$ref": "#/definitions/symbolicV2_9" diff --git a/Help/release/dev/file-api-fileSetIndexes.rst b/Help/release/dev/file-api-fileSetIndexes.rst new file mode 100644 index 0000000000..807adb192d --- /dev/null +++ b/Help/release/dev/file-api-fileSetIndexes.rst @@ -0,0 +1,8 @@ +file-api-fileSetIndexes +----------------------- + +* The :manual:`cmake-file-api(7)` "codemodel" version 2 "target" "sources" and + "interfaceSources" objects gained new ``fileSetIndexes`` fields to support + sources belonging to multiple file sets. The ``fileSetIndex`` fields are + maintained for backwards compatibility only, and users are advised to port + to the new fields. diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index 3627cb9416..d1dfd7ecef 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -462,7 +462,7 @@ class Target std::unordered_map CompileGroupMap; std::vector CompileGroups; - using FileSetDatabase = std::map; + using FileSetDatabase = std::map>; std::vector FileSetVisibilities; @@ -1802,7 +1802,7 @@ std::pair Target::DumpFileSets() } else { sf_path = cmStrCat(dir, '/', file); } - fsdb[sf_path] = static_cast(fsIndex); + fsdb[sf_path].emplace_back(static_cast(fsIndex)); } } @@ -1859,7 +1859,11 @@ Json::Value Target::DumpSource(cmGeneratorTarget::SourceAndKind const& sk, auto fsit = fsdb.find(path); if (fsit != fsdb.end()) { - source["fileSetIndex"] = fsit->second; + source["fileSetIndex"] = fsit->second.back(); + source["fileSetIndexes"] = Json::arrayValue; + for (Json::ArrayIndex const& fsIndex : fsit->second) { + source["fileSetIndexes"].append(fsIndex); + } } if (cmSourceGroup const* sg = @@ -1920,7 +1924,7 @@ Json::Value Target::DumpInterfaceSources(FileSetDatabase const& fsdb) } for (auto const& fsIter : fsdb) { - Json::ArrayIndex const index = fsIter.second; + Json::ArrayIndex const index = fsIter.second.back(); // FileSetVisibilities was populated by DumpFileSets() and will always // have the same size as the file sets array that index is indexing into if (this->FileSetVisibilities[index] != @@ -1946,7 +1950,11 @@ Json::Value Target::DumpInterfaceSource(std::string path, Json::ArrayIndex si, auto fsit = fsdb.find(path); if (fsit != fsdb.end()) { - source["fileSetIndex"] = fsit->second; + source["fileSetIndex"] = fsit->second.back(); + source["fileSetIndexes"] = Json::arrayValue; + for (Json::ArrayIndex const& fsIndex : fsit->second) { + source["fileSetIndexes"].append(fsIndex); + } } if (cmSourceGroup const* sg = diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-check.py b/Tests/RunCMake/FileAPI/codemodel-v2-check.py index b3958e7a34..7f2468e56e 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-check.py +++ b/Tests/RunCMake/FileAPI/codemodel-v2-check.py @@ -355,9 +355,20 @@ def check_target(c, major, minor): assert is_dict(actual) expected_keys = ["path"] - if expected["fileSetName"] is not None: + if expected["fileSetNames"] is not None: expected_keys.append("fileSetIndex") - assert is_string(obj["fileSets"][actual["fileSetIndex"]]["name"], expected["fileSetName"]) + expected_keys.append("fileSetIndexes") + + assert is_list(expected["fileSetIndexes"]) + assert is_list(expected["fileSetNames"]) + + assert is_list(actual["fileSetIndexes"]) + assert is_int(actual["fileSetIndex"], actual["fileSetIndexes"][-1]) + assert is_string(obj["fileSets"][actual["fileSetIndex"]]["name"], expected["fileSetNames"][-1]) + + assert is_int(len(actual["fileSetIndexes"]), len(expected["fileSetNames"])) + for (actual_idx, expected_name) in zip(actual["fileSetIndexes"], expected["fileSetNames"]): + assert is_string(obj["fileSets"][actual_idx]["name"], expected_name) if expected["compileGroupLanguage"] is not None: expected_keys.append("compileGroupIndex") @@ -1164,7 +1175,7 @@ def gen_check_build_system_targets(c, g, inSource): { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/CMakeFiles/([0-9a-f]+/)?generate\\.stamp\\.rule$", "isGenerated": True, - "fileSetName": None, + "fileSetNames": None, "sourceGroupName": "CMake Rules", "compileGroupLanguage": None, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/fileset.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/fileset.json index 1e84bb9609..1c9fd19a0b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/fileset.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/fileset.json @@ -134,7 +134,8 @@ "type": "fileSet", "destination": "include", "paths": [ - "^fileset/h3\\.h$" + "^fileset/h3\\.h$", + "^fileset/h5\\.h$" ], "isExcludeFromAll": null, "isForAllComponents": null, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_alias.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_alias.json index 2e1b90ed02..31cd19ebb3 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_alias.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_alias.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/alias/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/alias/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_custom.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_custom.json index 78e98bb62d..d986748b06 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_custom.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_custom.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/custom/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/custom/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_cxx.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_cxx.json index 9dc94a267d..582f01138b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_cxx.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_cxx.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/cxx/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/cxx/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_direct.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_direct.json index 0e157ce799..bf8ad081a6 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_direct.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_direct.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/direct/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/direct/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_external.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_external.json index 997b053793..db6d788df9 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_external.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_external.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/FileAPIExternalBuild/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/FileAPIExternalBuild/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_framework.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_framework.json index a984b84e79..e694aa1eab 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_framework.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_framework.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/framework/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/framework/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_imported.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_imported.json index 54a0e7124c..8947888e49 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_imported.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_imported.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/imported/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/imported/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_interface.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_interface.json index a8c94b748a..076fbaeb9e 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_interface.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_interface.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/interface/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/interface/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_object.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_object.json index 31a679d93d..8a9011ba3d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_object.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_object.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_top.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_top.json index 8df81337b7..ed0663bc4a 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_top.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/all_build_top.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/CMakeFiles/ALL_BUILD$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/CMakeFiles/ALL_BUILD\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_alias_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_alias_exe.json index 8235b2da25..eff3aebc5b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_alias_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_alias_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json index 247c8b963a..bdcd148ec9 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_1.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_1.json index 099ff3d14f..f52ad53fc8 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_1.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_1.json @@ -47,7 +47,7 @@ { "path": "^fileset/empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ @@ -68,7 +68,8 @@ { "path": "^fileset/error\\.c$", "isGenerated": null, - "fileSetName": "HEADERS", + "fileSetNames": ["HEADERS"], + "fileSetIndexes": [0], "sourceGroupName": "Header Files", "compileGroupLanguage": null, "backtrace": [ @@ -89,7 +90,8 @@ { "path": "^fileset/other\\.c$", "isGenerated": null, - "fileSetName": "HEADERS", + "fileSetNames": ["HEADERS"], + "fileSetIndexes": [0], "sourceGroupName": "Source Files", "compileGroupLanguage": null, "backtrace": [ @@ -110,7 +112,8 @@ { "path": "^fileset/h1\\.h$", "isGenerated": null, - "fileSetName": "a", + "fileSetNames": ["a"], + "fileSetIndexes": [1], "sourceGroupName": "Header Files", "compileGroupLanguage": null, "backtrace": [ @@ -131,7 +134,30 @@ { "path": "^fileset/dir/h4\\.h$", "isGenerated": null, - "fileSetName": "a", + "fileSetNames": ["a"], + "fileSetIndexes": [1], + "sourceGroupName": "Header Files", + "compileGroupLanguage": null, + "backtrace": [ + { + "file": "^fileset/CMakeLists\\.txt$", + "line": 3, + "command": "target_sources", + "hasParent": true + }, + { + "file": "^fileset/CMakeLists\\.txt$", + "line": null, + "command": null, + "hasParent": false + } + ] + }, + { + "path": "^fileset/h5\\.h$", + "isGenerated": null, + "fileSetNames": ["a", "c"], + "fileSetIndexes": [1, 3], "sourceGroupName": "Header Files", "compileGroupLanguage": null, "backtrace": [ @@ -152,7 +178,8 @@ { "path": "^fileset/dir/h2\\.h$", "isGenerated": null, - "fileSetName": "b", + "fileSetNames": ["b"], + "fileSetIndexes": [2], "sourceGroupName": "Header Files", "compileGroupLanguage": null, "backtrace": [ @@ -175,25 +202,36 @@ { "path": "^fileset/error\\.c$", "isGenerated": null, - "fileSetName": "HEADERS", + "fileSetNames": ["HEADERS"], + "fileSetIndexes": [0], "sourceGroupName": "Header Files" }, { "path": "^fileset/other\\.c$", "isGenerated": null, - "fileSetName": "HEADERS", + "fileSetNames": ["HEADERS"], + "fileSetIndexes": [0], "sourceGroupName": "Source Files" }, { "path": "^fileset/h3\\.h$", "isGenerated": null, - "fileSetName": "c", + "fileSetNames": ["c"], + "fileSetIndexes": [3], + "sourceGroupName": "Header Files" + }, + { + "path": "^fileset/h5\\.h$", + "isGenerated": null, + "fileSetNames": ["c"], + "fileSetIndexes": [1, 3], "sourceGroupName": "Header Files" }, { "path": "^fileset/dir/h2\\.h$", "isGenerated": null, - "fileSetName": "b", + "fileSetNames": ["b"], + "fileSetIndexes": [2], "sourceGroupName": "Header Files" } ], @@ -213,13 +251,15 @@ "sourcePaths": [ "^fileset/error\\.c$", "^fileset/h1\\.h$", + "^fileset/h5\\.h$", "^fileset/dir/h2\\.h$", "^fileset/dir/h4\\.h$" ], "interfaceSourcePaths": [ "^fileset/error\\.c$", - "^fileset/dir/h2\\.h$", - "^fileset/h3\\.h$" + "^fileset/h3\\.h$", + "^fileset/h5\\.h$", + "^fileset/dir/h2\\.h$" ] } ], diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_2.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_2.json index 11c84e7763..a6ca1aa82c 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_2.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_2.json @@ -23,7 +23,7 @@ { "path": "^fileset/empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ @@ -46,7 +46,7 @@ { "path": "^fileset/h1\\.h$", "isGenerated": null, - "fileSetName": "HEADERS", + "fileSetNames": ["HEADERS"], "sourceGroupName": "Header Files" } ], diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json index 71885301a7..e921dff33e 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_exe.json index 7c0c27afff..8a5a487433 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ @@ -35,7 +35,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(object|build/c_object_lib\\.build)/.*/empty(\\.c)?\\.o(bj)?$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Object Libraries", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_lib.json index 86800e1155..25206ad177 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json index 6401b6f59e..18f49375b3 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json index 70a0a83716..b371ca6930 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_1.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_1.json index 64adf2e0d4..aafd0f1c1b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_1.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_1.json @@ -31,7 +31,8 @@ { "path": "^fileset/empty\\.c$", "isGenerated": null, - "fileSetName": "public_srcs", + "fileSetNames": ["public_srcs"], + "fileSetIndexes": [0], "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ @@ -52,7 +53,8 @@ { "path": "^fileset/other\\.c$", "isGenerated": null, - "fileSetName": "SOURCES", + "fileSetNames": ["SOURCES"], + "fileSetIndexes": [0], "sourceGroupName": "Source Files", "compileGroupLanguage": null, "backtrace": [ @@ -75,7 +77,7 @@ { "path": "^fileset/empty\\.c$", "isGenerated": null, - "fileSetName": "SOURCES", + "fileSetNames": ["SOURCES"], "sourceGroupName": "Source Files" } ], diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_2.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_2.json index 65c7c77774..268e85a212 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_2.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_sources_2.json @@ -14,7 +14,8 @@ { "path": "^fileset/empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, + "fileSetIndexes": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json index 97dddf09f2..c4d12115a8 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json index 0a2dea014b..a1b4b190e6 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json index f54216a7ca..700690b2c6 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json @@ -14,7 +14,7 @@ { "path": "^subdir/empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/compile_usage_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/compile_usage_exe.json index 4c502dafd2..5a699d40cf 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/compile_usage_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/compile_usage_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_exe.json index fc087f9911..7b88c1600b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_tgt.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_tgt.json index 6b474e20df..cd30fb8770 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_tgt.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/custom_tgt.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/custom/CMakeFiles/custom_tgt(-(Debug|Release|RelWithDebInfo|MinSizeRel))?$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -35,7 +35,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(custom/)?CMakeFiles/([0-9a-f]+/)?custom_tgt(-\\(CONFIG\\))?\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_alias_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_alias_exe.json index 342d455f6b..e23fda9504 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_alias_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_alias_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json index 849535b94e..7af2e0a100 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator.json index ba2ab2a633..98db52d021 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator_args.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator_args.json index ebb6f173e3..2cd611f3fe 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator_args.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_cross_emulator_args.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader.json index 60e687d668..ea2a43ff4d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader.json @@ -109,7 +109,7 @@ { "path": ".*cmake_pch(_[^.]+)?(\\.hxx)?\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -124,7 +124,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -145,7 +145,7 @@ { "path": ".*/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_2arch.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_2arch.json index 1c063f5afc..6d140e3593 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_2arch.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_2arch.json @@ -161,7 +161,7 @@ { "path": ".*cmake_pch(_[^.]+)?(\\.hxx)?\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -176,7 +176,7 @@ { "path": ".*cmake_pch(_[^.]+)?(\\.hxx)?\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -191,7 +191,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -212,7 +212,7 @@ { "path": ".*/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ @@ -227,7 +227,7 @@ { "path": ".*/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_multigen.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_multigen.json index acabada495..ed662be01a 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_multigen.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_precompileheader_multigen.json @@ -109,7 +109,7 @@ { "path": ".*cmake_pch(_[^.]+)?(\\.hxx)?\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -124,7 +124,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -145,7 +145,7 @@ { "path": ".*/Debug/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ @@ -160,7 +160,7 @@ { "path": ".*/Release/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ @@ -175,7 +175,7 @@ { "path": ".*/MinSizeRel/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ @@ -190,7 +190,7 @@ { "path": ".*/RelWithDebInfo/cmake_pch(_[^.]+)?\\.hxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Precompile Header File", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher.json index 4bf5c1ee7f..f8d1155475 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher_and_cross_emulator.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher_and_cross_emulator.json index 66a735f232..05b21e93a1 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher_and_cross_emulator.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe_test_launcher_and_cross_emulator.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_lib.json index fbd6fd8e7f..2cb3e4dd22 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_exe.json index 283c7efb5e..9bbe71d3ac 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ @@ -35,7 +35,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(object|build/cxx_object_lib\\.build)/.*/empty(\\.cxx)?\\.o(bj)?$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Object Libraries", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_lib.json index 02bc1a3b38..96610f0884 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_exe.json index 643bab7f16..201923209c 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json index fbfe9d1d26..e8d1103104 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe.json index 4d1ee2dc14..a432c6bf32 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_compile_feature_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_exe.json index 35ef56b1e5..3077b5b872 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_standard_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_exe.json index a1547c243c..31a870d313 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_lib.json index a4a14506a0..571262e714 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_static_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/exe_framework.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/exe_framework.json index 5f56563955..b41d005808 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/exe_framework.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/exe_framework.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/generated_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/generated_exe.json index 30fecb8b97..0bd887dd2c 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/generated_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/generated_exe.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPIExternalSource/empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ @@ -35,7 +35,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/FileAPIExternalBuild/generated\\.cxx$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Generated Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/iface_srcs.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/iface_srcs.json index 8530a4c792..544be2bc1e 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/iface_srcs.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/iface_srcs.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/inject_direct_lib_impl.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/inject_direct_lib_impl.json index e14f1baf97..e5fdb58167 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/inject_direct_lib_impl.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/inject_direct_lib_impl.json @@ -14,7 +14,7 @@ { "path": "^direct/other\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json index 1c04f481ad..cb66b6aa56 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_exe.json index 4603edca94..eeed5a5301 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_exe.json index 640c523cdb..63a68e30c7 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_symbolic_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_symbolic_exe.json index b0ed28fb0e..9f0c0cd2a1 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_symbolic_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_interface_symbolic_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_object_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_object_exe.json index 71f62dd6f8..a71c0a0fbc 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_object_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_object_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_shared_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_shared_exe.json index 011b0c55c4..84fa7671af 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_shared_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_shared_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_static_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_static_exe.json index a0376c1148..afb44824f2 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_static_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_imported_static_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_transitive_direct_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_transitive_direct_exe.json index c273a69ed0..5046caf127 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_transitive_direct_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_transitive_direct_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ @@ -35,7 +35,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(direct|build/inject_direct_lib_impl\\.build)/.*/other(\\.c)?\\.o(bj)?$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Object Libraries", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_usage_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_usage_exe.json index 2cc10d2b9e..8a976f1efb 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_usage_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/link_usage_exe.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/shared_framework.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/shared_framework.json index 5785a122b6..de363c9764 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/shared_framework.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/shared_framework.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/static_framework.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/static_framework.json index a347aa2473..7887f5d447 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/static_framework.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/static_framework.json @@ -14,7 +14,7 @@ { "path": "^empty\\.cxx$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "CXX", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/transitive_direct_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/transitive_direct_lib.json index 7dc75d48c9..d3a1784e49 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/transitive_direct_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/transitive_direct_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/usage_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/usage_lib.json index 2f363bc744..8db09dab3c 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/usage_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/usage_lib.json @@ -14,7 +14,7 @@ { "path": "^empty\\.c$", "isGenerated": null, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "Source Files", "compileGroupLanguage": "C", "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_alias.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_alias.json index 95366919f3..8aa07fb6dd 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_alias.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_alias.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/alias/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/alias/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_custom.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_custom.json index 2fcc163367..0a8d00055d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_custom.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_custom.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/custom/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/custom/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_cxx.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_cxx.json index a6406fd4dd..514e19a021 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_cxx.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_cxx.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/cxx/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/cxx/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_direct.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_direct.json index ef207b9ed8..0595bf9a0e 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_direct.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_direct.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/direct/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/direct/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_external.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_external.json index 5852efac5e..8fd945d080 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_external.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_external.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/FileAPIExternalBuild/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/FileAPIExternalBuild/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_framework.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_framework.json index d3e0ca6800..b8fab2631d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_framework.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_framework.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/framework/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/framework/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_imported.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_imported.json index 81aa8ca113..ff33eff836 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_imported.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_imported.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/imported/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/imported/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_interface.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_interface.json index 91c6a25cf6..8cefd4a510 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_interface.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_interface.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/interface/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/interface/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_object.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_object.json index 14314bbb82..d7998c9fce 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_object.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_object.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_top.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_top.json index 5f15cb0a91..01441795f1 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_top.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/zero_check_top.json @@ -14,7 +14,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/CMakeFiles/ZERO_CHECK$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "", "compileGroupLanguage": null, "backtrace": [ @@ -29,7 +29,7 @@ { "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/CMakeFiles/ZERO_CHECK\\.rule$", "isGenerated": true, - "fileSetName": null, + "fileSetNames": null, "sourceGroupName": "CMake Rules", "compileGroupLanguage": null, "backtrace": [ diff --git a/Tests/RunCMake/FileAPI/fileset/CMakeLists.txt b/Tests/RunCMake/FileAPI/fileset/CMakeLists.txt index 183d7217a9..84fa2bac81 100644 --- a/Tests/RunCMake/FileAPI/fileset/CMakeLists.txt +++ b/Tests/RunCMake/FileAPI/fileset/CMakeLists.txt @@ -2,13 +2,13 @@ add_library(c_headers_1 STATIC empty.c) target_sources(c_headers_1 PUBLIC FILE_SET HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" FILES error.c other.c - PRIVATE FILE_SET a TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" FILES h1.h dir/h4.h + PRIVATE FILE_SET a TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" FILES h1.h dir/h4.h h5.h ) target_sources(c_headers_1 PUBLIC FILE_SET b TYPE HEADERS BASE_DIRS "$<1:${CMAKE_CURRENT_SOURCE_DIR}/dir>" FILES "$<1:${CMAKE_CURRENT_SOURCE_DIR}/dir/h2.h>" ) target_sources(c_headers_1 - INTERFACE FILE_SET c TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" FILES h3.h + INTERFACE FILE_SET c TYPE HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" FILES h3.h h5.h ) source_group("Source Files" FILES "${CMAKE_CURRENT_SOURCE_DIR}/other.c") diff --git a/Tests/RunCMake/FileAPI/fileset/h5.h b/Tests/RunCMake/FileAPI/fileset/h5.h new file mode 100644 index 0000000000..e69de29bb2