Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Duncan Ogilvie
CMake
Commits
62267715
Commit
62267715
authored
Oct 28, 2019
by
Brad King
💬
Browse files
Merge branch 'framework-tests-multiarch-old-macos' into release-3.16
Merge-request:
!3954
parents
c79e9d8c
3e30c4cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
View file @
62267715
.*/Framework:( Mach-O universal binary with [^
]*)? Mach-O[^
.*/Framework( \(for architecture [^\)]+\))?:[ ]+Mach-O[^
]* dynamically linked shared library.*
Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
View file @
62267715
/Framework: (Mach-O universal binary with [^
]*)?current ar archive random library
/Framework( \(for architecture [^\)]+\))?:[ ]+current ar archive random library
Tests/RunCMake/Framework/RunCMakeTest.cmake
View file @
62267715
...
...
@@ -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
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment