浏览代码

Merge topic 'fix-xcode12-arm64-tests'

447ecbb692 Apple: also specify sysroot for linking
16692f4926 Apple: suppress Xcode 12 ranlib warning

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5028
Brad King 5 年之前
父节点
当前提交
be0a224696
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      Tests/FindPackageModeMakefileTest/Makefile.in
  2. 1 0
      Tests/RunCMake/RunCMake.cmake

+ 1 - 1
Tests/FindPackageModeMakefileTest/Makefile.in

@@ -24,7 +24,7 @@ main.o: clean main.cpp
 pngtest: main.o
 pngtest: main.o
 	@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
 	@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
 	@foo="`cat $(tmp)`"; \
 	@foo="`cat $(tmp)`"; \
-	 printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
+	 printf '"%s" %s %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(__EXTRA_OSX_SYSROOT_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)
 	@rm -f $(tmp)

+ 1 - 0
Tests/RunCMake/RunCMake.cmake

@@ -154,6 +154,7 @@ function(run_cmake test)
 
 
     "|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type"
     "|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type"
     "|[^\n]*is a member of multiple groups"
     "|[^\n]*is a member of multiple groups"
+    "|[^\n]*offset in archive not a multiple of 8"
     "|[^\n]*from Time Machine by path"
     "|[^\n]*from Time Machine by path"
     "|[^\n]*Bullseye Testing Technology"
     "|[^\n]*Bullseye Testing Technology"
     ")[^\n]*\n)+"
     ")[^\n]*\n)+"