diff options
author | Brad King <brad.king@kitware.com> | 2022-10-31 13:42:10 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-31 09:42:29 -0400 |
commit | 5752150c648722a10679cdc696e35f273ba49bfc (patch) | |
tree | 22d1d9e79b022b43403fd9aca1b4e95d57cf7411 /Tests/RunCMake | |
parent | 0a2e26bcbfbcf273c2581ad81c405139513083d5 (diff) | |
parent | 024e3d2bf63c118f4a5da3ea872892ab274c697a (diff) | |
download | cmake-5752150c648722a10679cdc696e35f273ba49bfc.tar.gz |
Merge topic 'xcode-obj-dir'
024e3d2bf6 Xcode: Put object files in a place that Xcode cleans
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7843
Diffstat (limited to 'Tests/RunCMake')
7 files changed, 19 insertions, 8 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 3c9ace3b13..3392404981 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 e3a20df3a6..1917f92cec 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 119c91d429..e8d62188aa 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 8e99f7d6a1..24b391b24f 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 } ], diff --git a/Tests/RunCMake/XcodeProject/Clean-build-check.cmake b/Tests/RunCMake/XcodeProject/Clean-build-check.cmake new file mode 100644 index 0000000000..605881a52c --- /dev/null +++ b/Tests/RunCMake/XcodeProject/Clean-build-check.cmake @@ -0,0 +1,5 @@ +set(pattern "${RunCMake_TEST_BINARY_DIR}/build/empty.build/Debug/Objects-normal/*/empty.o") +file(GLOB objs "${pattern}") +if(NOT objs) + set(RunCMake_TEST_FAILED "Expected object does not exist:\n ${pattern}") +endif() diff --git a/Tests/RunCMake/XcodeProject/Clean-clean-check.cmake b/Tests/RunCMake/XcodeProject/Clean-clean-check.cmake new file mode 100644 index 0000000000..76ea8a14fd --- /dev/null +++ b/Tests/RunCMake/XcodeProject/Clean-clean-check.cmake @@ -0,0 +1,5 @@ +set(pattern "${RunCMake_TEST_BINARY_DIR}/build/empty.build/Debug/Objects-normal/*/empty.o") +file(GLOB objs "${pattern}") +if(objs) + set(RunCMake_TEST_FAILED "Object file(s) not cleaned:\n ${objs}") +endif() diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index fdf4411235..573d5f7198 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -2,9 +2,10 @@ include(RunCMake) function(RunClean) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Clean-build) - run_cmake(Clean) + run_cmake(Clean -DCMAKE_CONFIGURATION_TYPES=Debug) set(RunCMake_TEST_NO_CLEAN 1) - run_cmake_command(Clean-build xcodebuild clean) + run_cmake_command(Clean-build xcodebuild) + run_cmake_command(Clean-clean xcodebuild clean) endfunction() RunClean() |