diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-22 20:44:10 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-22 20:44:10 (GMT) |
| commit | be986c6cae449d8f2f81a5ea35ef08ca9ae9d3d8 (patch) | |
| tree | 4acf5bdd0f3a39bec8b9d69c23494a8f91636acf | |
| parent | 934d7d3dd680ed755ef1fe168a8afca12a496c56 (diff) | |
| download | CMake-be986c6cae449d8f2f81a5ea35ef08ca9ae9d3d8.zip CMake-be986c6cae449d8f2f81a5ea35ef08ca9ae9d3d8.tar.gz CMake-be986c6cae449d8f2f81a5ea35ef08ca9ae9d3d8.tar.bz2 | |
Revert back to 1.5, since it is fixed in ConvertToOutputPath and this breaks Windows 98
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index eed8c78..3c4a640 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -164,10 +164,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmSourceGroup& sourceGroup) std::string makefileIn = m_Makefile->GetStartDirectory(); makefileIn += "/"; makefileIn += "CMakeLists.txt"; - std::string makefileInNC = makefileIn; makefileIn = cmSystemTools::ConvertToOutputPath(makefileIn.c_str()); std::string dsprule = "${CMAKE_COMMAND}"; m_Makefile->ExpandVariablesInString(dsprule); + dsprule = cmSystemTools::ConvertToOutputPath(dsprule.c_str()); std::string args = makefileIn; args += " -H"; args += @@ -203,7 +203,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmSourceGroup& sourceGroup) std::vector<std::string> outputs; outputs.push_back(dspname); - cmCustomCommand cc(makefileInNC.c_str(), dsprule.c_str(), + cmCustomCommand cc(makefileIn.c_str(), dsprule.c_str(), args.c_str(), listFiles, outputs); @@ -555,7 +555,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(const cmTarget &target, { customRuleCode += "\t"; } - customRuleCode += cc.GetCommand() + " " + cc.GetArguments(); + customRuleCode += cmSystemTools::ConvertToOutputPath(cc.GetCommand().c_str()) + " " + cc.GetArguments(); } } |