mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Merge-request: !3954
This commit is contained in:
Brad King
2019-10-28 10:09:29 -04:00
parent c79e9d8c21 3e30c4cc1f
commit 62267715fe
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
View File

@@ -1,3 +1,2 @@
.*/Framework:( Mach-O universal binary with [^
]*)? Mach-O[^
.*/Framework( \(for architecture [^\)]+\))?:[ ]+Mach-O[^
]* dynamically linked shared library.*

3
Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
View File

@@ -1,2 +1 @@
/Framework: (Mach-O universal binary with [^
]*)?current ar archive random library
/Framework( \(for architecture [^\)]+\))?:[ ]+current ar archive random library

2
Tests/RunCMake/Framework/RunCMakeTest.cmake
View File

@@ -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()