Commit 62267715 authored by Brad King's avatar Brad King

Merge branch 'framework-tests-multiarch-old-macos' into release-3.16

Merge-request: !3954
parents c79e9d8c 3e30c4cc
.*/Framework:( Mach-O universal binary with [^
]*)? Mach-O[^
.*/Framework( \(for architecture [^\)]+\))?:[ ]+Mach-O[^
]* dynamically linked shared library.*
/Framework: (Mach-O universal binary with [^
]*)?current ar archive random library
/Framework( \(for architecture [^\)]+\))?:[ ]+current ar archive random library
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment