mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-03 12:49:50 -05:00
OS X: Fix regression handling frameworks for Ninja
Fix a regression created by commit 373faae5 (Refactor how bundles and
frameworks are supported, 2013-05-05).
Since the ninja file isn't aware of how framework symlinks work, we
suppress symlink creation and let cmOSXBundleGenerator handle it. Also,
use the real name of framework library in build rules as was done
before, instead of the symlink.
This commit is contained in:
committed by
Brad King
parent
e645ff0b10
commit
603bc5998f
@@ -265,7 +265,8 @@ cmNinjaNormalTargetGenerator
|
||||
rspcontent);
|
||||
}
|
||||
|
||||
if (this->TargetNameOut != this->TargetNameReal) {
|
||||
if (this->TargetNameOut != this->TargetNameReal &&
|
||||
!this->GetTarget()->IsFrameworkOnApple()) {
|
||||
std::string cmakeCommand =
|
||||
this->GetLocalGenerator()->ConvertToOutputFormat(
|
||||
this->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"),
|
||||
@@ -599,7 +600,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
|
||||
rspfile,
|
||||
commandLineLengthLimit);
|
||||
|
||||
if (targetOutput != targetOutputReal) {
|
||||
if (targetOutput != targetOutputReal &&
|
||||
!this->GetTarget()->IsFrameworkOnApple()) {
|
||||
if (targetType == cmTarget::EXECUTABLE) {
|
||||
globalGenerator->WriteBuild(this->GetBuildFileStream(),
|
||||
"Create executable symlink " + targetOutput,
|
||||
|
||||
Reference in New Issue
Block a user