diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2024-03-25 11:30:04 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2024-08-27 16:37:35 (GMT) |
| commit | 9c0491a3e41a0232ae10d53c0e12921bf1be4880 (patch) | |
| tree | 3ce3bfd1396aeb3a2622de2544b09b80a388d4e7 /Tests/RunCMake/CXXModules | |
| parent | 48faa19c194364ab33a2a95ddc6a9f003e9d2e06 (diff) | |
| download | CMake-9c0491a3e41a0232ae10d53c0e12921bf1be4880.zip CMake-9c0491a3e41a0232ae10d53c0e12921bf1be4880.tar.gz CMake-9c0491a3e41a0232ae10d53c0e12921bf1be4880.tar.bz2 | |
cmDyndepCollation: write out scanned source information too
This is required to fill in the `requires` field for sources using
modules that do not provide them.
Diffstat (limited to 'Tests/RunCMake/CXXModules')
8 files changed, 50 insertions, 8 deletions
diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json index 78f7928..4bb2455 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json @@ -47,5 +47,6 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-private.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-private.dir<CONFIG_DIR>", + "sources": {} } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json index 6c23354..364bce2 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json @@ -47,5 +47,6 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir<CONFIG_DIR>", + "sources": {} } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json index 71b2b66..45cd8ab 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json @@ -79,5 +79,6 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>", + "sources": {} } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json index a9cde99..43a4e4f 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json @@ -79,5 +79,6 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>", + "sources": {} } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-private.json index 7905c53..03e2018 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-private.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-private.json @@ -79,5 +79,6 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>", + "sources": {} } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-public.json index 1734590..4128252 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-public.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExportFilesystemSafe-public.json @@ -79,5 +79,6 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>", + "sources": {} } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json index ed61e0e..f4e19f4 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json @@ -42,5 +42,23 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-private.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-private.dir<CONFIG_DIR>", + "sources": { + "CMakeFiles/ninja-file-sets-private.dir/sources/module-impl.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-impl.cxx" + }, + "CMakeFiles/ninja-file-sets-private.dir/sources/module-internal-part-impl.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-internal-part-impl.cxx" + }, + "CMakeFiles/ninja-file-sets-private.dir/sources/module-part-impl.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-part-impl.cxx" + }, + "CMakeFiles/ninja-file-sets-private.dir/sources/module-use.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-use.cxx" + } + } } diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json index 171935f..9604ba2 100644 --- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json +++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json @@ -42,5 +42,23 @@ "language": "CXX", "forward-modules-from-target-dirs": [], "linked-target-dirs": [], - "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-public.dir<CONFIG_DIR>" + "module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-public.dir<CONFIG_DIR>", + "sources": { + "CMakeFiles/ninja-file-sets-public.dir/sources/module-impl.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-impl.cxx" + }, + "CMakeFiles/ninja-file-sets-public.dir/sources/module-internal-part-impl.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-internal-part-impl.cxx" + }, + "CMakeFiles/ninja-file-sets-public.dir/sources/module-part-impl.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-part-impl.cxx" + }, + "CMakeFiles/ninja-file-sets-public.dir/sources/module-use.cxx<OBJEXT>" : { + "language" : "CXX", + "source" : "<SOURCE_DIR>/sources/module-use.cxx" + } + } } |