diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-08-17 15:08:50 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-08-17 15:08:50 (GMT) |
| commit | 71c29d11b3d089dbc9fb403ceed7999419615810 (patch) | |
| tree | 3fd405328f3d5df0cef63d893dfae2b2935f2e14 /Source | |
| parent | afb3edc18149f48be6e1690c7d9b1c8f6816a056 (diff) | |
| download | CMake-71c29d11b3d089dbc9fb403ceed7999419615810.zip CMake-71c29d11b3d089dbc9fb403ceed7999419615810.tar.gz CMake-71c29d11b3d089dbc9fb403ceed7999419615810.tar.bz2 | |
Fix bootstrap test with automoc
Alex
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 3016f5a..27acf98 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -958,6 +958,7 @@ bool cmGlobalGenerator::CheckTargets() //---------------------------------------------------------------------------- void cmGlobalGenerator::CreateAutomocTargets() { +#ifdef CMAKE_BUILD_WITH_CMAKE for(unsigned int i=0; i < this->LocalGenerators.size(); ++i) { cmTargets& targets = @@ -979,6 +980,7 @@ void cmGlobalGenerator::CreateAutomocTargets() } } } +#endif } diff --git a/Source/cmake.cxx b/Source/cmake.cxx index c5eff1c..99b1844 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1573,14 +1573,13 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args) { return cmake::ExecuteEchoColor(args); } -#endif - else if (args[1] == "cmake_automoc") { cmQtAutomoc automoc; automoc.Run(args[2].c_str()); return 0; } +#endif // Tar files else if (args[1] == "tar" && args.size() > 3) |