summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.h
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-02-24 22:46:49 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-02-24 22:46:49 (GMT)
commitd680e51777b26789f57f9e18c74f4df269310250 (patch)
tree5e15847b834ece5b3bbf8c80fafe813bba6383db /Source/cmGlobalXCodeGenerator.h
parentea258e9a1a3a4fb77e41539f1914ea99ed0d7af7 (diff)
downloadCMake-d680e51777b26789f57f9e18c74f4df269310250.zip
CMake-d680e51777b26789f57f9e18c74f4df269310250.tar.gz
CMake-d680e51777b26789f57f9e18c74f4df269310250.tar.bz2
ENH: fix relative paths in xcode
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
-rw-r--r--Source/cmGlobalXCodeGenerator.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index cb9cd11..40d9c32 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -69,8 +69,10 @@ public:
virtual void Generate();
private:
+ void SetCurrentLocalGenerator(cmLocalGenerator*);
std::string XCodeEscapePath(const char* p);
- std::string ConvertToRelativeOutputPath(const char* p);
+ std::string ConvertToRelativeForXCode(const char* p);
+ std::string ConvertToRelativeForMake(const char* p);
void CreateCustomCommands(cmXCodeObject* buildPhases,
cmXCodeObject* sourceBuildPhase,
cmXCodeObject* headerBuildPhase,
@@ -135,7 +137,9 @@ private:
bool m_DoneAllBuild;
bool m_DoneXCodeHack;
std::string m_CurrentXCodeHackMakefile;
- std::string m_OutputDir;
+ std::string m_OutputDir;
+ std::vector<std::string> m_CurrentOutputDirectoryComponents;
+ std::vector<std::string> m_ProjectOutputDirectoryComponents;
};
#endif