diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-28 22:29:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-28 22:29:54 (GMT) |
| commit | 4e5cb398ae392079031ae6a880569349c29770a6 (patch) | |
| tree | 55b13e53e2368e0425602fb8527936accc50ac9a /Source/cmMakefileTargetGenerator.h | |
| parent | 78fdbbcb4130eedc2cb48ec9e67fad5c2beffb0e (diff) | |
| parent | daaf6283f5c0e8b7ea7ee93f983ad56d4498788d (diff) | |
| download | CMake-4e5cb398ae392079031ae6a880569349c29770a6.zip CMake-4e5cb398ae392079031ae6a880569349c29770a6.tar.gz CMake-4e5cb398ae392079031ae6a880569349c29770a6.tar.bz2 | |
Merge branch 'master' into vs12-generator
Resolve conflicts in Tests/Preprocess/CMakeLists.txt by keeping
the side from 'master'.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index 2798e54..f7a1e2e 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -233,7 +233,6 @@ protected: std::string TargetNamePDB; // Mac OS X content info. - std::string MacContentDirectory; std::set<cmStdString> MacContentFolders; cmOSXBundleGenerator* OSXBundleGenerator; MacOSXContentGeneratorType* MacOSXContentGenerator; |