diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-20 00:28:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-20 00:28:53 (GMT) |
| commit | c21287552bd262a60c38e495b75c91888882e681 (patch) | |
| tree | 62bb4118b8072fcbf4a0707d6d461f207e0134cc /Source | |
| parent | 518080136d2b643b2b27ae1ef69cee28306c2f81 (diff) | |
| download | CMake-c21287552bd262a60c38e495b75c91888882e681.zip CMake-c21287552bd262a60c38e495b75c91888882e681.tar.gz CMake-c21287552bd262a60c38e495b75c91888882e681.tar.bz2 | |
ENH: Switched order of slash and configuration name in cmGlobalGenerator::AppendDirectoryForConfig method to increase flexibility.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index e9731e0..8ddd654 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -495,7 +495,7 @@ cmGlobalVisualStudio6Generator { if(config) { - dir += "/"; dir += config; + dir += "/"; } } diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index e43263f..93ac900 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -717,7 +717,7 @@ cmGlobalVisualStudio7Generator { if(config) { - dir += "/"; dir += config; + dir += "/"; } } diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 7ab9720..95be32a 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2309,8 +2309,8 @@ cmGlobalXCodeGenerator { if(config) { - dir += "/"; dir += config; + dir += "/"; } } } diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 4238a53..52becb9 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1064,13 +1064,13 @@ std::string cmTarget::GetFullPath(const char* config, bool implib) { // Start with the output directory for the target. std::string fpath = this->GetDirectory(); + fpath += "/"; // Add the configuration's subdirectory. m_Makefile->GetLocalGenerator()->GetGlobalGenerator()-> AppendDirectoryForConfig(config, fpath); // Add the full name of the target. - fpath += "/"; fpath += this->GetFullName(config, implib); return fpath; } |