diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-20 13:10:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-20 15:20:42 (GMT) |
| commit | 6fbd4cae0d7765d305d753a78d167b3fcaa6eaf6 (patch) | |
| tree | 051865c2b01f491e3472f577f39a13080d55be43 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 594dd9b36a7f3ac37b56c89596ff38451570de3e (diff) | |
| download | CMake-6fbd4cae0d7765d305d753a78d167b3fcaa6eaf6.zip CMake-6fbd4cae0d7765d305d753a78d167b3fcaa6eaf6.tar.gz CMake-6fbd4cae0d7765d305d753a78d167b3fcaa6eaf6.tar.bz2 | |
Use cmSystemTools::GetCMakeCommand() to get path to cmake internally
This is much simpler than finding a way to lookup "CMAKE_COMMAND"
everywhere.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 4a7411c..0753235 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -582,8 +582,8 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( { makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str()); } - std::string cmake = mf->GetRequiredDefinition("CMAKE_COMMAND"); - makefileStream << "\n\t" << this->ConvertToRelativeForMake(cmake.c_str()) + makefileStream << "\n\t" << + this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str()) << " -H" << this->ConvertToRelativeForMake( mf->GetHomeDirectory()) << " -B" << this->ConvertToRelativeForMake( @@ -1447,7 +1447,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases, { cmCustomCommandLines cmd; cmd.resize(1); - cmd[0].push_back(this->CurrentMakefile->GetDefinition("CMAKE_COMMAND")); + cmd[0].push_back(cmSystemTools::GetCMakeCommand()); cmd[0].push_back("-E"); cmd[0].push_back("cmake_symlink_library"); std::string str_file = "$<TARGET_FILE:"; |