summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-12-01 17:48:32 (GMT)
committerBrad King <brad.king@kitware.com>2010-12-01 17:48:32 (GMT)
commitfb97ba629348cdc93ac26ce7c8ed8804a7a9fae3 (patch)
tree798dbde696e47d0da3f258f4042b1cdff79056e9 /Source/cmGlobalVisualStudio10Generator.h
parent5cf99388c3cf48e89c576b6f93af96fb4111be03 (diff)
downloadCMake-fb97ba629348cdc93ac26ce7c8ed8804a7a9fae3.zip
CMake-fb97ba629348cdc93ac26ce7c8ed8804a7a9fae3.tar.gz
CMake-fb97ba629348cdc93ac26ce7c8ed8804a7a9fae3.tar.bz2
Enable 64-bit tools with VS 2010 Express (#9981, #10722)
The Express Edition does not come with 64-bit tools, but one can install the "Microsoft Windows SDK v7.1" to get them. Detect this case and check for the SDK. If found, set PlatformToolset to use the SDK tools. Otherwise, fail with a concise and informative error.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 219c36e..bef5642 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -54,6 +54,12 @@ public:
cmMakefile *, bool optional);
virtual void WriteSLNHeader(std::ostream& fout);
+ /** Is the installed VS an Express edition? */
+ bool IsExpressEdition() const { return this->ExpressEdition; }
+
+ /** The toolset name for the target platform. */
+ const char* GetPlatformToolset();
+
/**
* Where does this version of Visual Studio look for macros for the
* current user? Returns the empty string if this version of Visual
@@ -70,5 +76,9 @@ public:
{ return "$(Configuration)";}
protected:
virtual const char* GetIDEVersion() { return "10.0"; }
+
+ std::string PlatformToolset;
+private:
+ bool ExpressEdition;
};
#endif