diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-28 14:29:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-28 19:38:07 (GMT) |
| commit | 024e3d2bf63c118f4a5da3ea872892ab274c697a (patch) | |
| tree | f7153c58fd1914a31239fa8ced19a76a743ee728 /Tests/RunCMake/FileAPI | |
| parent | 59ae2543165b836d01b88fe0ba4e22ecd549e239 (diff) | |
| download | CMake-024e3d2bf63c118f4a5da3ea872892ab274c697a.zip CMake-024e3d2bf63c118f4a5da3ea872892ab274c697a.tar.gz CMake-024e3d2bf63c118f4a5da3ea872892ab274c697a.tar.bz2 | |
Xcode: Put object files in a place that Xcode cleans
Since commit dc5fc898f6 (Xcode: Set object file locations using
TARGET_TEMP_DIR, 2022-09-29, v3.25.0-rc1~64^2~1), `xcodebuild clean`
does not remove the object files in our explicit `TARGET_TEMP_DIR`
because it is not under the `SYMROOT`. Put it there.
Fixes: #24096
Diffstat (limited to 'Tests/RunCMake/FileAPI')
4 files changed, 6 insertions, 6 deletions
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 3c9ace3..3392404 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 @@ -27,7 +27,7 @@ ] }, { - "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/.*/empty(\\.c)?\\.o(bj)?$", + "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(object|build/c_object_lib\\.build)/.*/empty(\\.c)?\\.o(bj)?$", "isGenerated": true, "sourceGroupName": "Object Libraries", "compileGroupLanguage": null, @@ -57,7 +57,7 @@ { "name": "Object Libraries", "sourcePaths": [ - "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/.*/empty(\\.c)?\\.o(bj)?$" + "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(object|build/c_object_lib\\.build)/.*/empty(\\.c)?\\.o(bj)?$" ] } ], 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 e3a20df..1917f92 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 @@ -64,7 +64,7 @@ "nameOnDisk": null, "artifacts": [ { - "path": "^object/.*/empty(\\.c)?\\.o(bj)?$", + "path": "^(object|build/c_object_lib\\.build)/.*/empty(\\.c)?\\.o(bj)?$", "_dllExtra": false } ], 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 119c91d..e8d6218 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 @@ -27,7 +27,7 @@ ] }, { - "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/.*/empty(\\.cxx)?\\.o(bj)?$", + "path": "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(object|build/cxx_object_lib\\.build)/.*/empty(\\.cxx)?\\.o(bj)?$", "isGenerated": true, "sourceGroupName": "Object Libraries", "compileGroupLanguage": null, @@ -57,7 +57,7 @@ { "name": "Object Libraries", "sourcePaths": [ - "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/object/.*/empty(\\.cxx)?\\.o(bj)?$" + "^.*/Tests/RunCMake/FileAPI/codemodel-v2-build/(object|build/cxx_object_lib\\.build)/.*/empty(\\.cxx)?\\.o(bj)?$" ] } ], 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 8e99f7d..24b391b 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 @@ -64,7 +64,7 @@ "nameOnDisk": null, "artifacts": [ { - "path": "^object/.*/empty(\\.cxx)?\\.o(bj)?$", + "path": "^(object|build/cxx_object_lib\\.build)/.*/empty(\\.cxx)?\\.o(bj)?$", "_dllExtra": false } ], |