From 71c29d11b3d089dbc9fb403ceed7999419615810 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Wed, 17 Aug 2011 17:08:50 +0200 Subject: Fix bootstrap test with automoc Alex --- Source/cmGlobalGenerator.cxx | 2 ++ 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& 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) -- cgit v0.12