diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-22 12:46:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-22 12:47:38 (GMT) |
| commit | 52e9225e4f03d7da2b85b3ddf4381ff273b3dff3 (patch) | |
| tree | 239da42c6ff1afb020dea6168cac1b9d71df699e | |
| parent | 01140ccb25c28ad014278f89445885d41923c133 (diff) | |
| parent | 7c79fde5fbcaaab90ade361f1fc4f6bc3928ed02 (diff) | |
| download | CMake-52e9225e4f03d7da2b85b3ddf4381ff273b3dff3.zip CMake-52e9225e4f03d7da2b85b3ddf4381ff273b3dff3.tar.gz CMake-52e9225e4f03d7da2b85b3ddf4381ff273b3dff3.tar.bz2 | |
Merge topic 'xcode14'
7c79fde5fb Xcode: automatically create Info.plist for signing during compiler id
116cc5a57b cm_cxx_features: filter out warnings from Xcode 14
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7391
| -rw-r--r-- | Modules/CompilerId/Xcode-3.pbxproj.in | 1 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx_features.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in index 43e8cc8..543c6a9 100644 --- a/Modules/CompilerId/Xcode-3.pbxproj.in +++ b/Modules/CompilerId/Xcode-3.pbxproj.in @@ -83,6 +83,7 @@ buildSettings = { CODE_SIGNING_REQUIRED = NO; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; + GENERATE_INFOPLIST_FILE = YES; SYMROOT = .; @id_archs@ @id_arch_active@ diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index f20572e..c88f5a3 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -48,7 +48,7 @@ function(cm_check_cxx_feature name) # Filter out libhugetlbfs warnings. string(REGEX REPLACE "[^\n]*libhugetlbfs [^\n]*: WARNING[^\n]*" "" check_output "${check_output}") # Filter out xcodebuild warnings. - string(REGEX REPLACE "[^\n]* xcodebuild\\[[0-9]*:[0-9]*\\] warning: [^\n]*" "" check_output "${check_output}") + string(REGEX REPLACE "[^\n]* xcodebuild\\[[0-9]*:[0-9]*\\][^\n]*[Ww]arning: [^\n]*" "" check_output "${check_output}") # Filter out icpc warnings string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding [^\n]*" "" check_output "${check_output}") # Filter out ld warnings. |