summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-05-08 20:37:18 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-05-08 20:37:18 (GMT)
commit5af310502142252995ad5d74e66355be4094b7cc (patch)
tree788f361a5dfd462d1ab57b41c44973038af0a2a2
parent2ed6191fce4bc15a89a9306a3e60f9c1a127fd7a (diff)
downloadCMake-5af310502142252995ad5d74e66355be4094b7cc.zip
CMake-5af310502142252995ad5d74e66355be4094b7cc.tar.gz
CMake-5af310502142252995ad5d74e66355be4094b7cc.tar.bz2
ENH: getting closer
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx20
1 files changed, 16 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1682e6a..7e6d506 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2623,10 +2623,22 @@ cmGlobalXCodeGenerator
{
if(config)
{
-
- dir += prefix;
- dir += config;
- dir += suffix;
+ if(dir.find(".framework") != dir.npos)
+ {
+ std::string::size_type pos = dir.rfind("/");
+ std::string framework = dir.substr(pos);
+ std::string newDir;
+ newDir = dir.substr(0, pos);
+ newDir += "/";
+ newDir += config;
+ dir = newDir;
+ }
+ else
+ {
+ dir += prefix;
+ dir += config;
+ dir += suffix;
+ }
}
}
}