diff options
author | Brad King <brad.king@kitware.com> | 2007-03-12 16:35:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2007-03-12 16:35:11 (GMT) |
commit | fb38af53c0536de7abda7f9a5eea2527f087caf1 (patch) | |
tree | 84dca98bd0c0d419b196698d3188e110e7354940 /Source/cmGlobalVisualStudio8Generator.cxx | |
parent | 55603ea9ebc044d8d811198d924851c2a1cc9ddb (diff) | |
download | CMake-fb38af53c0536de7abda7f9a5eea2527f087caf1.zip CMake-fb38af53c0536de7abda7f9a5eea2527f087caf1.tar.gz CMake-fb38af53c0536de7abda7f9a5eea2527f087caf1.tar.bz2 |
BUG: Split precompiled header flags into a separate per-global-generator flag map. This is needed because the flag mappings differ across VS IDE versions. This fixes bug#3512 for VS8 where as the previous fix only worked for VS7.
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index f2f29b5..c512e07 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -36,6 +36,7 @@ cmLocalGenerator *cmGlobalVisualStudio8Generator::CreateLocalGenerator() { cmLocalVisualStudio7Generator *lg = new cmLocalVisualStudio7Generator; lg->SetVersion8(); + lg->SetExtraFlagTable(this->GetExtraFlagTableVS8()); lg->SetGlobalGenerator(this); return lg; } @@ -245,3 +246,21 @@ cmGlobalVisualStudio8Generator } } } + +//---------------------------------------------------------------------------- +static cmVS7FlagTable cmVS8ExtraFlagTable[] = +{ + // Precompiled header and related options. Note that the + // UsePrecompiledHeader entries are marked as "Continue" so that the + // corresponding PrecompiledHeaderThrough entry can be found. + {"UsePrecompiledHeader", "Yu", "Use Precompiled Header", "2", + cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, + {"PrecompiledHeaderThrough", "Yu", "Precompiled Header Name", "", + cmVS7FlagTable::UserValueRequired}, + // There is no YX option in the VS8 IDE. + {0,0,0,0,0} +}; +cmVS7FlagTable const* cmGlobalVisualStudio8Generator::GetExtraFlagTableVS8() +{ + return cmVS8ExtraFlagTable; +} |