summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-07 16:58:25 (GMT)
committerBrad King <brad.king@kitware.com>2014-08-20 14:21:12 (GMT)
commita43f44000d12c1357eeed04e5a02d11236730dfa (patch)
tree9212c4495f8dc4896af1aaef1e8b42d69612ca40 /Source/cmGlobalVisualStudio7Generator.h
parentdf3b007d7f904f8de5877f3e05b629239af7220a (diff)
downloadCMake-a43f44000d12c1357eeed04e5a02d11236730dfa.zip
CMake-a43f44000d12c1357eeed04e5a02d11236730dfa.tar.gz
CMake-a43f44000d12c1357eeed04e5a02d11236730dfa.tar.bz2
VS: Move internal MasmEnabled member up to VS 7 generator
Move the member from cmGlobalVisualStudio10Generator to cmGlobalVisualStudio7Generator to make it useful for earlier versions of VS. Set the member to true only starting with cmGlobalVisualStudio8Generator since we will not implement MASM support for versions less than VS 8.
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 390b97c..7e3ed23 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -102,6 +102,9 @@ public:
virtual void FindMakeProgram(cmMakefile*);
+ /** Is the Microsoft Assembler enabled? */
+ bool IsMasmEnabled() const { return this->MasmEnabled; }
+
// Encoding for Visual Studio files
virtual std::string Encoding();
@@ -173,6 +176,7 @@ protected:
// There is one SLN file per project.
std::string CurrentProject;
std::string PlatformName;
+ bool MasmEnabled;
private:
char* IntelProjectVersion;