diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-06 20:55:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-06 20:55:10 (GMT) |
| commit | 1ed726a46c11ac3b9836b210584cd90e91ae3174 (patch) | |
| tree | c079c32017d51b78014001c7bb4d8add21ad8740 /Source/cmGlobalVisualStudio10Generator.h | |
| parent | dba225db334a89aae3835d98f200bb1ce3eb8753 (diff) | |
| parent | 28e770cf6eb1be898e6904e85849f701ab71b5c1 (diff) | |
| download | CMake-1ed726a46c11ac3b9836b210584cd90e91ae3174.zip CMake-1ed726a46c11ac3b9836b210584cd90e91ae3174.tar.gz CMake-1ed726a46c11ac3b9836b210584cd90e91ae3174.tar.bz2 | |
Merge topic 'vs-masm'
28e770c VS10: Add support for assembler code (#11536)
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 21682f8..0a95091 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -54,6 +54,9 @@ public: /** Is the installed VS an Express edition? */ bool IsExpressEdition() const { return this->ExpressEdition; } + /** Is the Microsoft Assembler enabled? */ + bool IsMasmEnabled() const { return this->MasmEnabled; } + /** The toolset name for the target platform. */ const char* GetPlatformToolset(); @@ -83,6 +86,7 @@ protected: std::string PlatformToolset; bool ExpressEdition; + bool MasmEnabled; bool UseFolderProperty(); |