mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests/CXXModules: fix multi-config and MSVC details

Browse Source
This commit is contained in:
Ben Boeckel
2023-09-25 18:09:40 -04:00
parent 11b62ef118
commit 5ab6b09691
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json
View File

@@ -10,7 +10,7 @@
"compiler-simulate-id": "<IGNORE>",
"config": "<CONFIG>",
"cxx-modules": {
"CMakeFiles/ninja-bmi-install-private.dir/sources/module-internal-part.cxx.o": {
"CMakeFiles/ninja-bmi-install-private.dir<CONFIG_DIR>/sources/module-internal-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "internal_partitions",
@@ -19,7 +19,7 @@
"type": "CXX_MODULES",
"visibility": "PRIVATE"
},
"CMakeFiles/ninja-bmi-install-private.dir/sources/module-part.cxx.o": {
"CMakeFiles/ninja-bmi-install-private.dir<CONFIG_DIR>/sources/module-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "modules",
@@ -28,7 +28,7 @@
"type": "CXX_MODULES",
"visibility": "PRIVATE"
},
"CMakeFiles/ninja-bmi-install-private.dir/sources/module.cxx.o": {
"CMakeFiles/ninja-bmi-install-private.dir<CONFIG_DIR>/sources/module.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "modules",
@@ -46,5 +46,5 @@
"include-dirs": [],
"language": "CXX",
"linked-target-dirs": [],
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-private.dir"
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-private.dir<CONFIG_DIR>"
}

10
Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json
View File

@@ -3,14 +3,14 @@
"destination": "lib/cxx/modules/<CONFIG>",
"message-level": "",
"permissions": "",
"script-location": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir/install-cxx-module-bmi-noconfig.cmake"
"script-location": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir/install-cxx-module-bmi-<CONFIG_FORCE>.cmake"
},
"compiler-id": "<IGNORE>",
"compiler-frontend-variant": "<IGNORE>",
"compiler-simulate-id": "<IGNORE>",
"config": "<CONFIG>",
"cxx-modules": {
"CMakeFiles/ninja-bmi-install-public.dir/sources/module-internal-part.cxx.o": {
"CMakeFiles/ninja-bmi-install-public.dir<CONFIG_DIR>/sources/module-internal-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx/internals",
"name": "internal_partitions",
@@ -19,7 +19,7 @@
"type": "CXX_MODULES",
"visibility": "PUBLIC"
},
"CMakeFiles/ninja-bmi-install-public.dir/sources/module-part.cxx.o": {
"CMakeFiles/ninja-bmi-install-public.dir<CONFIG_DIR>/sources/module-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx",
"name": "modules",
@@ -28,7 +28,7 @@
"type": "CXX_MODULES",
"visibility": "PUBLIC"
},
"CMakeFiles/ninja-bmi-install-public.dir/sources/module.cxx.o": {
"CMakeFiles/ninja-bmi-install-public.dir<CONFIG_DIR>/sources/module.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx",
"name": "modules",
@@ -46,5 +46,5 @@
"include-dirs": [],
"language": "CXX",
"linked-target-dirs": [],
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir"
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir<CONFIG_DIR>"
}

8
Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json
View File

@@ -5,7 +5,7 @@
"compiler-simulate-id": "<IGNORE>",
"config": "<CONFIG>",
"cxx-modules": {
"CMakeFiles/ninja-exports-private.dir/sources/module-internal-part.cxx.o": {
"CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>/sources/module-internal-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "internal_partitions",
@@ -14,7 +14,7 @@
"type": "CXX_MODULES",
"visibility": "PRIVATE"
},
"CMakeFiles/ninja-exports-private.dir/sources/module-part.cxx.o": {
"CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>/sources/module-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "modules",
@@ -23,7 +23,7 @@
"type": "CXX_MODULES",
"visibility": "PRIVATE"
},
"CMakeFiles/ninja-exports-private.dir/sources/module.cxx.o": {
"CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>/sources/module.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "modules",
@@ -74,5 +74,5 @@
"include-dirs": [],
"language": "CXX",
"linked-target-dirs": [],
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-private.dir"
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-private.dir<CONFIG_DIR>"
}

8
Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json
View File

@@ -5,7 +5,7 @@
"compiler-simulate-id": "<IGNORE>",
"config": "<CONFIG>",
"cxx-modules": {
"CMakeFiles/ninja-exports-public.dir/sources/module-internal-part.cxx.o": {
"CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>/sources/module-internal-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx/internals",
"name": "internal_partitions",
@@ -14,7 +14,7 @@
"type": "CXX_MODULES",
"visibility": "PUBLIC"
},
"CMakeFiles/ninja-exports-public.dir/sources/module-part.cxx.o": {
"CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>/sources/module-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx",
"name": "modules",
@@ -23,7 +23,7 @@
"type": "CXX_MODULES",
"visibility": "PUBLIC"
},
"CMakeFiles/ninja-exports-public.dir/sources/module.cxx.o": {
"CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>/sources/module.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx",
"name": "modules",
@@ -74,5 +74,5 @@
"include-dirs": [],
"language": "CXX",
"linked-target-dirs": [],
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-public.dir"
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-exports-public.dir<CONFIG_DIR>"
}

8
Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json
View File

@@ -5,7 +5,7 @@
"compiler-simulate-id": "<IGNORE>",
"config": "<CONFIG>",
"cxx-modules": {
"CMakeFiles/ninja-file-sets-private.dir/sources/module-internal-part.cxx.o": {
"CMakeFiles/ninja-file-sets-private.dir<CONFIG_DIR>/sources/module-internal-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "internal_partitions",
@@ -14,7 +14,7 @@
"type": "CXX_MODULES",
"visibility": "PRIVATE"
},
"CMakeFiles/ninja-file-sets-private.dir/sources/module-part.cxx.o": {
"CMakeFiles/ninja-file-sets-private.dir<CONFIG_DIR>/sources/module-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "modules",
@@ -23,7 +23,7 @@
"type": "CXX_MODULES",
"visibility": "PRIVATE"
},
"CMakeFiles/ninja-file-sets-private.dir/sources/module.cxx.o": {
"CMakeFiles/ninja-file-sets-private.dir<CONFIG_DIR>/sources/module.cxx<OBJEXT>": {
"bmi-only": false,
"destination": null,
"name": "modules",
@@ -41,5 +41,5 @@
"include-dirs": [],
"language": "CXX",
"linked-target-dirs": [],
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-private.dir"
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-private.dir<CONFIG_DIR>"
}

8
Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json
View File

@@ -5,7 +5,7 @@
"compiler-simulate-id": "<IGNORE>",
"config": "<CONFIG>",
"cxx-modules": {
"CMakeFiles/ninja-file-sets-public.dir/<CONFIG_DIR>sources/module-internal-part.cxx.o": {
"CMakeFiles/ninja-file-sets-public.dir<CONFIG_DIR>/sources/module-internal-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx/internals",
"name": "internal_partitions",
@@ -14,7 +14,7 @@
"type": "CXX_MODULES",
"visibility": "PUBLIC"
},
"CMakeFiles/ninja-file-sets-public.dir/<CONFIG_DIR>sources/module-part.cxx.o": {
"CMakeFiles/ninja-file-sets-public.dir<CONFIG_DIR>/sources/module-part.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx",
"name": "modules",
@@ -23,7 +23,7 @@
"type": "CXX_MODULES",
"visibility": "PUBLIC"
},
"CMakeFiles/ninja-file-sets-public.dir/<CONFIG_DIR>sources/module.cxx.o": {
"CMakeFiles/ninja-file-sets-public.dir<CONFIG_DIR>/sources/module.cxx<OBJEXT>": {
"bmi-only": false,
"destination": "lib/cxx",
"name": "modules",
@@ -41,5 +41,5 @@
"include-dirs": [],
"language": "CXX",
"linked-target-dirs": [],
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-public.dir"
"module-dir": "<BINARY_DIR>/CMakeFiles/ninja-file-sets-public.dir<CONFIG_DIR>"
}