From c453f2fc7ae665f584124617c080bc8906f6bf06 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 2 Jul 2001 16:30:40 -0400 Subject: FIX: BuildName removes path to compiler and converts any illegal characters --- Source/cmBuildNameCommand.cxx | 14 +++++++------- 1 file 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& 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", -- cgit v0.12