diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-07-17 05:01:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-22 13:40:11 (GMT) |
| commit | 603bc5998f4892996c9b189a2b2f86695e79e96e (patch) | |
| tree | d2bdc9cac9602b3737cd53781e04d85e64000b05 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | e645ff0b10567e400c722dfc28c58dc4fd8d181b (diff) | |
| download | CMake-603bc5998f4892996c9b189a2b2f86695e79e96e.zip CMake-603bc5998f4892996c9b189a2b2f86695e79e96e.tar.gz CMake-603bc5998f4892996c9b189a2b2f86695e79e96e.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 9596ebc..245883c 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -824,13 +824,19 @@ cmGlobalNinjaGenerator cmLocalNinjaGenerator *ng = static_cast<cmLocalNinjaGenerator *>(this->LocalGenerators[0]); + // for frameworks, we want the real name, not smple name + // frameworks always appear versioned, and the build.ninja + // will always attempt to manage symbolic links instead + // of letting cmOSXBundleGenerator do it. + bool realname = target->IsFrameworkOnApple(); + switch (target->GetType()) { case cmTarget::EXECUTABLE: case cmTarget::SHARED_LIBRARY: case cmTarget::STATIC_LIBRARY: case cmTarget::MODULE_LIBRARY: outputs.push_back(ng->ConvertToNinjaPath( - target->GetFullPath(configName).c_str())); + target->GetFullPath(configName, false, realname).c_str())); break; case cmTarget::OBJECT_LIBRARY: |