diff options
| author | Jim Miller <millerjv@crd.ge.com> | 2001-07-02 20:30:40 (GMT) |
|---|---|---|
| committer | Jim Miller <millerjv@crd.ge.com> | 2001-07-02 20:30:40 (GMT) |
| commit | c453f2fc7ae665f584124617c080bc8906f6bf06 (patch) | |
| tree | 66f9aad298e07f0c1303c088cf452b8ee3a88e4e | |
| parent | 6307ffbb650a16f498cb7ba393b846eef4b92e09 (diff) | |
| download | CMake-c453f2fc7ae665f584124617c080bc8906f6bf06.zip CMake-c453f2fc7ae665f584124617c080bc8906f6bf06.tar.gz CMake-c453f2fc7ae665f584124617c080bc8906f6bf06.tar.bz2 | |
FIX: BuildName removes path to compiler and converts any illegal characters
| -rw-r--r-- | Source/cmBuildNameCommand.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmBuildNameCommand.cxx b/Source/cmBuildNameCommand.cxx index f5f0658..91b7edb 100644 --- a/Source/cmBuildNameCommand.cxx +++ b/Source/cmBuildNameCommand.cxx @@ -68,18 +68,18 @@ bool cmBuildNameCommand::InitialPass(std::vector<std::string>& args) if(reg.find(buildname.c_str())) { buildname = reg.match(1) + "-" + reg.match(2); - cmSystemTools::ReplaceString(buildname, - "/", "_"); - cmSystemTools::ReplaceString(buildname, - "(", "_"); - cmSystemTools::ReplaceString(buildname, - ")", "_"); } } } std::string compiler = "-${CMAKE_CXX_COMPILER}"; m_Makefile->ExpandVariablesInString ( compiler ); - buildname += compiler; + buildname += cmSystemTools::GetFilenameName(compiler); + cmSystemTools::ReplaceString(buildname, + "/", "_"); + cmSystemTools::ReplaceString(buildname, + "(", "_"); + cmSystemTools::ReplaceString(buildname, + ")", "_"); cmCacheManager::GetInstance()-> AddCacheEntry("BUILDNAME", |