diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-21 13:03:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-21 13:03:52 (GMT) |
| commit | 3e3a09d1d3c91a6522260734b4542b420152e21c (patch) | |
| tree | bd3291e1b44702c2adfe23287f7c6a00e46cb41b /Source/cmLocalGenerator.cxx | |
| parent | 2c54622ff57b2ccb44d4e99e2fefb0501dbccb92 (diff) | |
| parent | 6fbd4cae0d7765d305d753a78d167b3fcaa6eaf6 (diff) | |
| download | CMake-3e3a09d1d3c91a6522260734b4542b420152e21c.zip CMake-3e3a09d1d3c91a6522260734b4542b420152e21c.tar.gz CMake-3e3a09d1d3c91a6522260734b4542b420152e21c.tar.bz2 | |
Merge topic 'clean-up-CMAKE_COMMAND'
6fbd4cae Use cmSystemTools::GetCMakeCommand() to get path to cmake internally
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 0f18225..118d5a3 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1001,9 +1001,7 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable, } if(variable == "CMAKE_COMMAND") { - const char* cmcommand = - this->GetMakefile()->GetDefinition("CMAKE_COMMAND"); - return this->Convert(cmcommand, FULL, SHELL); + return this->Convert(cmSystemTools::GetCMakeCommand(), FULL, SHELL); } std::vector<std::string> enabledLanguages; this->GlobalGenerator->GetEnabledLanguages(enabledLanguages); |