summaryrefslogtreecommitdiffstats
path: root/Source/cmDSPWriter.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-05-17 16:08:46 (GMT)
committerKen Martin <ken.martin@kitware.com>2001-05-17 16:08:46 (GMT)
commitaa72e182fe88aeacb4a812c1041499973922d3cd (patch)
tree34b6e83f91a1427718f1d68f4cbc323d76c2b8db /Source/cmDSPWriter.cxx
parente093e4a4e001cd620e36d30eb05d44210117e6f9 (diff)
downloadCMake-aa72e182fe88aeacb4a812c1041499973922d3cd.zip
CMake-aa72e182fe88aeacb4a812c1041499973922d3cd.tar.gz
CMake-aa72e182fe88aeacb4a812c1041499973922d3cd.tar.bz2
half checked in changes for CMAKE_ROOT
Diffstat (limited to 'Source/cmDSPWriter.cxx')
-rw-r--r--Source/cmDSPWriter.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx
index d313ae3..fe3fc98 100644
--- a/Source/cmDSPWriter.cxx
+++ b/Source/cmDSPWriter.cxx
@@ -137,7 +137,7 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
makefileIn += m_Makefile->GetStartDirectory();
makefileIn += "/";
makefileIn += "CMakeLists.txt\"";
- std::string dsprule = "${CMAKE} ";
+ std::string dsprule = "${CMAKE_COMMAND} ";
dsprule += makefileIn;
dsprule += " -DSP -H\"";
dsprule += m_Makefile->GetHomeDirectory();
@@ -360,18 +360,18 @@ void cmDSPMakefile::WriteDSPEndGroup(std::ostream& fout)
void cmDSPMakefile::SetBuildType(BuildType b, const char *libName)
{
- std::string root= m_Makefile->GetHomeDirectory();
+ std::string root= cmCacheManager::GetInstance()->GetCacheValue("CMAKE_ROOT");
const char *def= m_Makefile->GetDefinition( "MSPROJECT_TEMPLATE_DIRECTORY");
if( def)
{
- root = def;
+ root = def;
}
else
{
- root += "/CMake/Source";
+ root += "/Templates";
}
-
+
switch(b)
{
case STATIC_LIBRARY: