diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-28 14:09:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-28 14:09:29 (GMT) |
| commit | 62267715fe6f69162b834c6ee96ca6073ff96d15 (patch) | |
| tree | 7377e61b68bfe4439c2c6e3079ac4201b0c267be | |
| parent | c79e9d8c210fd928bfb39a57634094ab74f8d120 (diff) | |
| parent | 3e30c4cc1fb116807feaae326dab3e14c51a8ae7 (diff) | |
| download | CMake-62267715fe6f69162b834c6ee96ca6073ff96d15.zip CMake-62267715fe6f69162b834c6ee96ca6073ff96d15.tar.gz CMake-62267715fe6f69162b834c6ee96ca6073ff96d15.tar.bz2 | |
Merge branch 'framework-tests-multiarch-old-macos' into release-3.16
Merge-request: !3954
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() |