diff options
| author | Brad King <brad.king@kitware.com> | 2009-09-19 16:00:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-09-19 16:00:09 (GMT) |
| commit | d4cfb77ffe816f71d456dc70ab18efb7eb19d82d (patch) | |
| tree | 87908f67a85c448de02380c7078db623084ead8a /Source/cmGlobalXCodeGenerator.h | |
| parent | 180c60a86f5c44085a1a66865bfc8b9479c72e8a (diff) | |
| download | CMake-d4cfb77ffe816f71d456dc70ab18efb7eb19d82d.zip CMake-d4cfb77ffe816f71d456dc70ab18efb7eb19d82d.tar.gz CMake-d4cfb77ffe816f71d456dc70ab18efb7eb19d82d.tar.bz2 | |
Remove cmGlobalXCode21Generator subclass
This subclass of cmGlobalXCodeGenerator only provided two virtual method
overrides, and it made construction of the Xcode generator instance
complicated. This commit removes it and replaces the virtual methods
with tests of the Xcode version. The change removes duplicate code.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 03082d2..3dd105c 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -80,7 +80,7 @@ public: std::string& dir); ///! What is the configurations directory variable called? - virtual const char* GetCMakeCFGInitDirectory() { return "."; } + virtual const char* GetCMakeCFGInitDirectory(); void GetTargetObjectFileDirectories(cmTarget* target, std::vector<std::string>& @@ -149,9 +149,8 @@ private: std::vector<cmLocalGenerator*>& generators); void OutputXCodeProject(cmLocalGenerator* root, std::vector<cmLocalGenerator*>& generators); - virtual void WriteXCodePBXProj(std::ostream& fout, - cmLocalGenerator* root, - std::vector<cmLocalGenerator*>& generators); + void WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* root, + std::vector<cmLocalGenerator*>& generators); cmXCodeObject* CreateXCodeFileReference(cmSourceFile* sf, cmTarget& cmtarget); cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen, |