mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'xcode-obj-dir'

Browse Source 
024e3d2bf6 Xcode: Put object files in a place that Xcode cleans

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7843
This commit is contained in:
Brad King
2022-10-31 13:42:10 +00:00
committed by Kitware Robot
parent 0a2e26bcbf 024e3d2bf6
commit 5752150c64
9 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_exe.json
+2 -2
View File
@@ -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)?$"
]
}
],
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_object_lib.json
+1 -1
View File
@@ -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
}
],
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_exe.json
+2 -2
View File
@@ -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)?$"
]
}
],
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_object_lib.json
+1 -1
View File
@@ -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
}
],
Tests/RunCMake/XcodeProject/Clean-build-check.cmake
+5
View File
@@ -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()
Tests/RunCMake/XcodeProject/Clean-clean-check.cmake
+5
View File
@@ -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()
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+3 -2
View File
@@ -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()