diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-28 12:48:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-28 12:48:08 (GMT) |
| commit | 2fd5fd1f4d93322e85d662c1467a46cd7da84560 (patch) | |
| tree | 8c8137da252205a04292234d577a82909ac699a3 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 1e8c920d0409770214a4ff517f6a4c31b9830f45 (diff) | |
| parent | 13a37f5f76eb03e01e9ca225281531233ff0006c (diff) | |
| download | CMake-2fd5fd1f4d93322e85d662c1467a46cd7da84560.zip CMake-2fd5fd1f4d93322e85d662c1467a46cd7da84560.tar.gz CMake-2fd5fd1f4d93322e85d662c1467a46cd7da84560.tar.bz2 | |
Merge topic 'minor-cleanups'
13a37f5f cmMakefile: Fix typo in comment
958508bb cmMakefile: Fix style
91a829c1 Makefiles: Remove unused variable
e0213882 cmTarget: Remove obsolete member
0554c2c9 cmTarget: Fix style
b22e5d0a Remove some obsolete declarations
ce43ed2c Use LocalGenerator when possible
d90c9738 Makefiles: Remove some unneeded casts
331023ae Export: Remove unused variable
a03f3d0e cmFunctionBlocker: Constify method
d50c4220 Xcode: Fix typo in comment
803f1901 Xcode: Remove trailing semicolon
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 7dd24fb..ce7815d 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -15,7 +15,6 @@ #include "cmMakefile.h" #include "cmake.h" #include "cmGeneratedFileStream.h" -#include "cmSourceFile.h" #include "cmGeneratorTarget.h" #include "cmAlgorithms.h" @@ -158,8 +157,7 @@ void cmGlobalUnixMakefileGenerator3::Generate() } for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i) { - cmLocalUnixMakefileGenerator3 *lg = - static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]); + cmLocalGenerator *lg = this->LocalGenerators[i]; std::string markFileName = lg->GetCurrentBinaryDirectory(); markFileName += "/"; markFileName += cmake::GetCMakeFilesDirectory(); @@ -982,7 +980,7 @@ cmGlobalUnixMakefileGenerator3 //---------------------------------------------------------------------------- size_t cmGlobalUnixMakefileGenerator3 -::CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg) +::CountProgressMarksInAll(cmLocalGenerator* lg) { size_t count = 0; std::set<cmGeneratorTarget const*> emitted; |