diff options
| author | Morné Chamberlain <thefreeman.za@gmail.com> | 2012-11-24 18:23:55 (GMT) |
|---|---|---|
| committer | Morné Chamberlain <thefreeman.za@gmail.com> | 2012-11-24 18:23:55 (GMT) |
| commit | b3ae61f8338fd3b2308de0173c34a329ba46d191 (patch) | |
| tree | 72c3a159ba5f430a920ebe04057e383f8b155ec1 /Source/cmcldeps.cxx | |
| parent | 089d9ccdce530ebd08dfc4681833cefeff4a7eb9 (diff) | |
| parent | 79357448ceac5a8657c5be25bd3f02cd3345b934 (diff) | |
| download | CMake-b3ae61f8338fd3b2308de0173c34a329ba46d191.zip CMake-b3ae61f8338fd3b2308de0173c34a329ba46d191.tar.gz CMake-b3ae61f8338fd3b2308de0173c34a329ba46d191.tar.bz2 | |
Merge branch 'master' into sublime-text-2-generator
Diffstat (limited to 'Source/cmcldeps.cxx')
| -rw-r--r-- | Source/cmcldeps.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 34350bf..04dab59 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -237,12 +237,14 @@ int main() { // needed to suppress filename output of msvc tools std::string srcfilename; + { std::string::size_type pos = srcfile.rfind("\\"); if (pos == std::string::npos) { srcfilename = srcfile; } else { srcfilename = srcfile.substr(pos + 1); } + } std::string nol = " /nologo "; std::string show = " /showIncludes "; @@ -266,10 +268,12 @@ int main() { // call cl in object dir so the .i is generated there std::string objdir; + { std::string::size_type pos = objfile.rfind("\\"); if (pos != std::string::npos) { objdir = objfile.substr(0, pos); } + } // extract dependencies with cl.exe int exit_code = process(srcfilename, dfile, objfile, |