diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-08-28 14:57:25 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-08-28 14:57:25 (GMT) |
| commit | c7bd083549ab5ff7c14884dd6fd309ea9ccaa16b (patch) | |
| tree | 221266788410d300793798901b6985f91d1001cd /Source/cmUnixMakefileGenerator.cxx | |
| parent | 98b4ea2609793d57e0fe8ea68d7e8b97bb4802e4 (diff) | |
| download | CMake-c7bd083549ab5ff7c14884dd6fd309ea9ccaa16b.zip CMake-c7bd083549ab5ff7c14884dd6fd309ea9ccaa16b.tar.gz CMake-c7bd083549ab5ff7c14884dd6fd309ea9ccaa16b.tar.bz2 | |
BUG: fix for broken apple mkdir and general clean up of MakeDirectory command
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index d93b803..eb985e1 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -59,25 +59,41 @@ void cmUnixMakefileGenerator::GenerateMakefile() if (m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH")) { m_LibraryOutputPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"); - if(m_LibraryOutputPath.size() && - m_LibraryOutputPath[m_LibraryOutputPath.size() -1] != '/') + if(m_LibraryOutputPath.size()) { - m_LibraryOutputPath += "/"; + if(m_LibraryOutputPath[m_LibraryOutputPath.size() -1] != '/') + { + m_LibraryOutputPath += "/"; + } + if(!cmSystemTools::MakeDirectory(m_LibraryOutputPath.c_str())) + { + cmSystemTools::Error("Error failed create " + "LIBRARY_OUTPUT_PATH directory:", + m_LibraryOutputPath.c_str()); + } + m_Makefile->AddLinkDirectory(m_LibraryOutputPath.c_str()); } - cmSystemTools::MakeDirectory(m_LibraryOutputPath.c_str()); - m_Makefile->AddLinkDirectory(m_LibraryOutputPath.c_str()); } if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH")) { - m_ExecutableOutputPath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); - if(m_ExecutableOutputPath.size() && - m_ExecutableOutputPath[m_ExecutableOutputPath.size() -1] != '/') + m_ExecutableOutputPath = + m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); + if(m_ExecutableOutputPath.size()) { - m_ExecutableOutputPath += "/"; + if(m_ExecutableOutputPath[m_ExecutableOutputPath.size() -1] != '/') + { + m_ExecutableOutputPath += "/"; + } + if(!cmSystemTools::MakeDirectory(m_ExecutableOutputPath.c_str())) + { + cmSystemTools::Error("Error failed to create " + "EXECUTABLE_OUTPUT_PATH directory:", + m_ExecutableOutputPath.c_str()); + } + m_Makefile->AddLinkDirectory(m_ExecutableOutputPath.c_str()); } - cmSystemTools::MakeDirectory(m_ExecutableOutputPath.c_str()); - m_Makefile->AddLinkDirectory(m_ExecutableOutputPath.c_str()); } + if(m_CacheOnly) { |