diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-20 13:57:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-20 13:58:02 (GMT) |
| commit | be0a2246963a296cc168f5f05638d21999c71b05 (patch) | |
| tree | 76cd78fdf6654345d5dcf94b6156c82eaacefa8d /Tests | |
| parent | 6f67138822d2cb7ef06ab7c3d3978b7de412f052 (diff) | |
| parent | 447ecbb6920a00adbed7fb65836b1fbdab2adb98 (diff) | |
| download | CMake-be0a2246963a296cc168f5f05638d21999c71b05.zip CMake-be0a2246963a296cc168f5f05638d21999c71b05.tar.gz CMake-be0a2246963a296cc168f5f05638d21999c71b05.tar.bz2 | |
Merge topic 'fix-xcode12-arm64-tests'
447ecbb692 Apple: also specify sysroot for linking
16692f4926 Apple: suppress Xcode 12 ranlib warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5028
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/FindPackageModeMakefileTest/Makefile.in | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in index 5ef67d0..af9fa96 100644 --- a/Tests/FindPackageModeMakefileTest/Makefile.in +++ b/Tests/FindPackageModeMakefileTest/Makefile.in @@ -24,7 +24,7 @@ main.o: clean main.cpp pngtest: main.o @$(CMAKE_FOO) -DMODE=LINK >$(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) @sh $(tmp) @rm -f $(tmp) diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index cb20fb1..c13c694 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/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]*is a member of multiple groups" + "|[^\n]*offset in archive not a multiple of 8" "|[^\n]*from Time Machine by path" "|[^\n]*Bullseye Testing Technology" ")[^\n]*\n)+" |