diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-05-05 20:19:05 -0600 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-05-23 10:42:49 -0400 |
| commit | 373faae5e1c936351b143b0561c61ef9884303e1 (patch) | |
| tree | d5559e6ed2dea2570492c1004c493bfcba76cb1e /Source/cmExportInstallFileGenerator.cxx | |
| parent | 78185f598c152b1dbce632e953874ce8132c5fe9 (diff) | |
| download | cmake-373faae5e1c936351b143b0561c61ef9884303e1.tar.gz | |
Refactor how bundles and frameworks are supported.
Make handling of directory separators consistent between
non-bundle and bundle code.
Remove xcode specific flag from cmTarget when getting install_name.
Add (more) consistent convenience functions in cmTarget to get
directories inside of bundles and frameworks to add files to.
This refactor also fixes bug #12263 where frameworks
had the wrong install name when SKIP_BUILD_RPATH.
Also make install_name for frameworks consistent between Makefile
and Xcode generator.
Diffstat (limited to 'Source/cmExportInstallFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index ad12b5a13c..fff807c074 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -351,13 +351,7 @@ cmExportInstallFileGenerator prop += suffix; // Append the installed file name. - if(target->IsFrameworkOnApple()) - { - value += itgen->GetInstallFilename(target, config); - value += ".framework/"; - value += itgen->GetInstallFilename(target, config); - } - else if(target->IsCFBundleOnApple()) + if(target->IsCFBundleOnApple()) { const char *ext = target->GetProperty("BUNDLE_EXTENSION"); if (!ext) |