diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-18 14:12:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-18 14:12:34 (GMT) |
| commit | d526ebc603b0a83a7a1602ed4ddcf1b483077cf4 (patch) | |
| tree | 0ab06841f6ee3b6caccd65b8c2c43b697c7daed4 /Source/cmGlobalVisualStudio12Generator.h | |
| parent | 7a39d32f05ecb77227d304e5fe055cccbabd2739 (diff) | |
| parent | 689cd0d43ee1a09006f859df9d3eaf0ec0f8d430 (diff) | |
| download | CMake-d526ebc603b0a83a7a1602ed4ddcf1b483077cf4.zip CMake-d526ebc603b0a83a7a1602ed4ddcf1b483077cf4.tar.gz CMake-d526ebc603b0a83a7a1602ed4ddcf1b483077cf4.tar.bz2 | |
Merge topic 'vs-check-phone-store-tools'
689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228)
b20a32ac VS: Improve error messages when compiler is not detected (#15228)
Diffstat (limited to 'Source/cmGlobalVisualStudio12Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio12Generator.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index ec85f10..a81516f 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -41,8 +41,14 @@ public: protected: virtual bool InitializeWindowsPhone(cmMakefile* mf); virtual bool InitializeWindowsStore(cmMakefile* mf); - virtual std::string SelectWindowsPhoneToolset() const; - virtual std::string SelectWindowsStoreToolset() const; + virtual bool SelectWindowsPhoneToolset(std::string& toolset) const; + virtual bool SelectWindowsStoreToolset(std::string& toolset) const; + + // These aren't virtual because we need to check if the selected version + // of the toolset is installed + bool IsWindowsDesktopToolsetInstalled() const; + bool IsWindowsPhoneToolsetInstalled() const; + bool IsWindowsStoreToolsetInstalled() const; virtual const char* GetIDEVersion() { return "12.0"; } private: class Factory; |