diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-17 13:25:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-17 13:26:05 (GMT) |
| commit | 3020354f7c86f959d707aed2b833692204dd7778 (patch) | |
| tree | 79dc1ca02491338fe78001ffdd4c72ad26cac212 /Source/cmGlobalMSYSMakefileGenerator.cxx | |
| parent | 736f9d184da2109b009078e3184e996883bd7554 (diff) | |
| parent | 23e8364aedcbeb7ce606b6075c98827e52f0c7f6 (diff) | |
| download | CMake-3020354f7c86f959d707aed2b833692204dd7778.zip CMake-3020354f7c86f959d707aed2b833692204dd7778.tar.gz CMake-3020354f7c86f959d707aed2b833692204dd7778.tar.bz2 | |
Merge topic 'string-cleanup'
23e8364aed Source: std::string related cleanup
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3324
Diffstat (limited to 'Source/cmGlobalMSYSMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index 606febe..7b58389 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -48,7 +48,7 @@ void cmGlobalMSYSMakefileGenerator::EnableLanguage( const std::string& makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); std::vector<std::string> locations; - std::string makeloc = cmSystemTools::GetProgramPath(makeProgram.c_str()); + std::string makeloc = cmSystemTools::GetProgramPath(makeProgram); locations.push_back(this->FindMinGW(makeloc)); locations.push_back(makeloc); locations.push_back("/mingw/bin"); @@ -77,8 +77,8 @@ void cmGlobalMSYSMakefileGenerator::EnableLanguage( if (!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile() && !(1 == l.size() && l[0] == "NONE")) { cmSystemTools::Error( - "CMAKE_AR was not found, please set to archive program. ", - mf->GetDefinition("CMAKE_AR")); + "CMAKE_AR was not found, please set to archive program. " + + mf->GetSafeDefinition("CMAKE_AR")); } } |