summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-02-13 23:49:09 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-02-13 23:49:09 (GMT)
commit21b18581bd7da49c80d6806b0f3e83ea0af2b076 (patch)
tree3d784cdc39b9192332e5cb322a373055a30110d7
parentdd36c5f29649bb33c634822cedf901c356fdc544 (diff)
downloadCMake-21b18581bd7da49c80d6806b0f3e83ea0af2b076.zip
CMake-21b18581bd7da49c80d6806b0f3e83ea0af2b076.tar.gz
CMake-21b18581bd7da49c80d6806b0f3e83ea0af2b076.tar.bz2
ENH: new vnl
-rw-r--r--Source/cmConfigureFileNoAutoconf.cxx7
-rw-r--r--Source/cmMakefile.cxx2
2 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmConfigureFileNoAutoconf.cxx b/Source/cmConfigureFileNoAutoconf.cxx
index 86a5897..e4815a1 100644
--- a/Source/cmConfigureFileNoAutoconf.cxx
+++ b/Source/cmConfigureFileNoAutoconf.cxx
@@ -42,6 +42,13 @@ void cmConfigureFileNoAutoconf::FinalPass()
m_InputFile.c_str());
return;
}
+ cmSystemTools::ConvertToUnixSlashes(m_OuputFile);
+ std::string::size_type pos = m_OuputFile.rfind('/');
+ if(pos != std::string::npos)
+ {
+ std::string path = m_OuputFile.substr(0, pos);
+ cmSystemTools::MakeDirectory(path.c_str());
+ }
std::ofstream fout(m_OuputFile.c_str());
if(!fout)
{
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ec6c2d4..4872d94 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -327,7 +327,7 @@ void cmMakefile::ParseDirectory(const char* dir)
void cmMakefile::ExpandVaribles()
{
// make sure binary and source dir are defined
- this->AddDefinition("CMAKE_BINARY_DIR", this->GetOutputDirectory());
+ this->AddDefinition("CMAKE_BINARY_DIR", this->GetOutputHomeDirectory());
this->AddDefinition("CMAKE_SOURCE_DIR", this->GetHomeDirectory());
// Now expand varibles in the include and link strings