diff options
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmake.cxx | 20 | ||||
| -rwxr-xr-x | bootstrap | 3 |
3 files changed, 10 insertions, 18 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator.cxx b/Source/cmGlobalUnixMakefileGenerator.cxx index b4b472d..e4b7f51 100644 --- a/Source/cmGlobalUnixMakefileGenerator.cxx +++ b/Source/cmGlobalUnixMakefileGenerator.cxx @@ -16,7 +16,7 @@ =========================================================================*/ #include "cmGlobalUnixMakefileGenerator.h" -#include "cmLocalUnixMakefileGenerator.h" +#include "cmLocalUnixMakefileGenerator2.h" #include "cmMakefile.h" #include "cmake.h" @@ -31,6 +31,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(std::vector<std::string>const cmMakefile *mf) { mf->AddDefinition("CMAKE_CFG_INTDIR","."); + mf->AddDefinition("CMAKE_GENERATOR_NEW", "1"); this->cmGlobalGenerator::EnableLanguage(languages, mf); std::string path; for(std::vector<std::string>::const_iterator l = languages.begin(); @@ -73,7 +74,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(std::vector<std::string>const ///! Create a local generator appropriate to this Global Generator cmLocalGenerator *cmGlobalUnixMakefileGenerator::CreateLocalGenerator() { - cmLocalGenerator *lg = new cmLocalUnixMakefileGenerator; + cmLocalGenerator* lg = new cmLocalUnixMakefileGenerator2; lg->SetGlobalGenerator(this); return lg; } diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 716f59d..f909159 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -25,9 +25,10 @@ #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmVariableWatch.h" # include "cmVersion.h" -# include "cmLocalUnixMakefileGenerator2.h" #endif +#include "cmLocalUnixMakefileGenerator2.h" + // only build kdevelop generator on non-windows platforms // when not bootstrapping cmake #if !defined(_WIN32) @@ -291,20 +292,11 @@ void cmake::SetArgs(const std::vector<std::string>& args) } else if(arg.find("-S",0) == 0) { - directoriesSet = true; - m_Local = true; - std::string path = arg.substr(2); - path = cmSystemTools::CollapseFullPath(path.c_str()); - cmSystemTools::ConvertToUnixSlashes(path); - this->SetStartDirectory(path.c_str()); + // There is no local generate anymore. Ignore -S option. } else if(arg.find("-O",0) == 0) { - directoriesSet = true; - std::string path = arg.substr(2); - path = cmSystemTools::CollapseFullPath(path.c_str()); - cmSystemTools::ConvertToUnixSlashes(path); - this->SetStartOutputDirectory(path.c_str()); + // There is no local generate anymore. Ignore -O option. } else if(arg.find("-B",0) == 0) { @@ -839,13 +831,11 @@ int cmake::CMakeCommand(std::vector<std::string>& args) return result; } -#ifdef CMAKE_BUILD_WITH_CMAKE // Internal CMake dependency scanning support. else if (args[1] == "cmake_depends" && args.size() >= 5) { return cmLocalUnixMakefileGenerator2::ScanDependencies(args)? 0 : 1; } -#endif #if defined(_WIN32) && !defined(__CYGWIN__) // Write registry value @@ -1664,10 +1654,8 @@ int cmake::CheckBuildSystem() } } -#if defined(CMAKE_BUILD_WITH_CMAKE) // We do not need to rerun CMake. Check dependency integrity. cmLocalUnixMakefileGenerator2::CheckDependencies(mf); -#endif // No need to rerun. return 0; @@ -36,6 +36,8 @@ CMAKE_CXX_SOURCES="\ cmake \ cmakewizard \ cmakemain \ + cmDepends \ + cmDependsC \ cmMakeDepend \ cmMakefile \ cmGeneratedFileStream \ @@ -48,6 +50,7 @@ CMAKE_CXX_SOURCES="\ cmLocalXCodeGenerator \ cmXCodeObject \ cmLocalUnixMakefileGenerator \ + cmLocalUnixMakefileGenerator2 \ cmBootstrapCommands \ cmCommands \ cmTarget \ |