diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-13 13:22:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-16 14:18:01 (GMT) |
| commit | c68cc0661218c62f32d11cb600183e645c81a3de (patch) | |
| tree | f5f9ed60ee709ba8d5adc97e38e41dbfe4aab9cf /Source/cmGlobalXCodeGenerator.h | |
| parent | 48eb7fc7d7b3fa5570a7b32968fa2cff07bf6fe7 (diff) | |
| parent | 3a53005f7dd5e582b855ef1f3c0e6814ce7d024a (diff) | |
| download | CMake-c68cc0661218c62f32d11cb600183e645c81a3de.zip CMake-c68cc0661218c62f32d11cb600183e645c81a3de.tar.gz CMake-c68cc0661218c62f32d11cb600183e645c81a3de.tar.bz2 | |
Merge branch 'object-library' into ninja-object-library
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index ed54be3..b9cf775 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -74,11 +74,8 @@ public: std::string& dir); ///! What is the configurations directory variable called? - virtual const char* GetCMakeCFGInitDirectory(); + virtual const char* GetCMakeCFGIntDir() const; - void GetTargetObjectFileDirectories(cmTarget* target, - std::vector<std::string>& - dirs); void SetCurrentLocalGenerator(cmLocalGenerator*); /** Return true if the generated build tree may contain multiple builds. |