diff options
author | David Cole <david.cole@kitware.com> | 2007-10-10 15:06:15 (GMT) |
---|---|---|
committer | David Cole <david.cole@kitware.com> | 2007-10-10 15:06:15 (GMT) |
commit | 8e4c7b99e1b73c641308c0177673dac33fe57df1 (patch) | |
tree | ad00c757835a3ac785fd1b3e78ca3b75c2f1a354 /Source/cmInstallTargetGenerator.cxx | |
parent | aa9ba5c3efcd32ea631435318f63dc476ac39798 (diff) | |
download | CMake-8e4c7b99e1b73c641308c0177673dac33fe57df1.zip CMake-8e4c7b99e1b73c641308c0177673dac33fe57df1.tar.gz CMake-8e4c7b99e1b73c641308c0177673dac33fe57df1.tar.bz2 |
ENH: Finish up the Framework creation code restructuring. Frameworks build and install now. More work needed on the packaging step. See Tests/Framework for example use.
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
-rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 347d8fe..abe9348 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -238,8 +238,18 @@ cmInstallTargetGenerator { // Compute the build tree location of the framework directory std::string from1 = fromDirConfig; - // Remove trailing slashes - cmSystemTools::ConvertToUnixSlashes(from1); + if(config && *config) + { + from1 += "/"; + from1 += targetName; + from1 += ".framework"; + } + else + { + // Remove trailing slashes... so that from1 ends with ".framework": + // + cmSystemTools::ConvertToUnixSlashes(from1); + } files.push_back(from1); type = cmTarget::INSTALL_DIRECTORY; |