diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-28 14:10:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-28 14:10:37 (GMT) |
| commit | 336a826f77be90229dc3ee82c647148bb02220a9 (patch) | |
| tree | 0b2bd93a6e131059e30f511d999bcda3174f578c /Tests | |
| parent | f289ab61e36b94b9b718aa22b55b79b882df7b93 (diff) | |
| parent | 3e30c4cc1fb116807feaae326dab3e14c51a8ae7 (diff) | |
| download | CMake-336a826f77be90229dc3ee82c647148bb02220a9.zip CMake-336a826f77be90229dc3ee82c647148bb02220a9.tar.gz CMake-336a826f77be90229dc3ee82c647148bb02220a9.tar.bz2 | |
Merge topic 'framework-tests-multiarch-old-macos'
3e30c4cc1f Tests: Match file command output for older macOS (Framework test)
89ad3b3959 Tests: Prevent CMP0012 policy warnings in Framework test output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3954
Diffstat (limited to 'Tests')
3 files changed, 3 insertions, 5 deletions
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt index f664db9..4a92a45 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt @@ -1,3 +1,2 @@ -.*/Framework:( Mach-O universal binary with [^ -]*)? Mach-O[^ +.*/Framework( \(for architecture [^\)]+\))?:[ ]+Mach-O[^ ]* dynamically linked shared library.* diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt index 4b5f761..dd64717 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt @@ -1,2 +1 @@ -/Framework: (Mach-O universal binary with [^ -]*)?current ar archive random library +/Framework( \(for architecture [^\)]+\))?:[ ]+current ar archive random library diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake index c7e1319..965fbf4 100644 --- a/Tests/RunCMake/Framework/RunCMakeTest.cmake +++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake @@ -25,7 +25,7 @@ function(framework_type_test Toolchain Type UseProperty) set(RunCMake_TEST_NO_CLEAN 1) set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake") list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}") - if(NOT ${UseProperty}) + if(NOT UseProperty) list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_FRAMEWORK=YES") endif() |