diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-17 09:33:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-19 15:02:33 (GMT) |
| commit | b5f093f09652d6e7a2bb7a94b5a76e09b664cf68 (patch) | |
| tree | 94b1031480ae31cec89026b16d54e8de0615cb61 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | fa85829712aac5d274706c5ddd7e719819155713 (diff) | |
| download | CMake-b5f093f09652d6e7a2bb7a94b5a76e09b664cf68.zip CMake-b5f093f09652d6e7a2bb7a94b5a76e09b664cf68.tar.gz CMake-b5f093f09652d6e7a2bb7a94b5a76e09b664cf68.tar.bz2 | |
VS: Simplify setting of flag table.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 63c18a7..62d6f97 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -59,7 +59,6 @@ cmLocalVisualStudio7Generator cmLocalGenerator* parent): cmLocalVisualStudioGenerator(v, gg, parent) { - this->ExtraFlagTable = 0; this->Internal = new cmLocalVisualStudio7GeneratorInternals(this); } @@ -773,7 +772,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, } Options targetOptions(this, t, table, - this->ExtraFlagTable); + gg->ExtraFlagTable); targetOptions.FixExceptionHandlingDefault(); std::string asmLocation = configName + "/"; targetOptions.AddFlag("AssemblerListingLocation", asmLocation.c_str()); @@ -1842,7 +1841,7 @@ bool cmLocalVisualStudio7Generator table = cmLocalVisualStudio7GeneratorFortranFlagTable; } Options fileOptions(this, tool, table, - this->ExtraFlagTable); + gg->ExtraFlagTable); fileOptions.Parse(fc.CompileFlags.c_str()); fileOptions.AddDefines(fc.CompileDefs.c_str()); fileOptions.AddDefines(fc.CompileDefsConfig.c_str()); |