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/cmLocalVisualStudio7Generator.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/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f9a2d32..d954a52 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -914,12 +914,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, // for FAT32 file systems, which can cause an empty manifest // to be embedded into the resulting executable. See CMake // bug #2617. - const char* tool = "VCManifestTool"; + const char* manifestTool = "VCManifestTool"; if(this->FortranProject) { - tool = "VFManifestTool"; + manifestTool = "VFManifestTool"; } - fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n" + fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << manifestTool << "\"\n" << "\t\t\t\tUseFAT32Workaround=\"true\"\n" << "\t\t\t/>\n"; } @@ -1003,6 +1003,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, } switch(target.GetType()) { + case cmTarget::UNKNOWN_LIBRARY: + break; case cmTarget::OBJECT_LIBRARY: { std::string libpath = this->GetTargetDirectory(target); |