diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-20 15:56:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-10-20 17:00:25 (GMT) |
| commit | 6511654164dd483b4ff0c3eb5775d5fdb2c53564 (patch) | |
| tree | d65f98e1d83d00742ef019c256ca7ec9db780753 /Source | |
| parent | 2f7e72a341dba3554e44c93c69a3b8338a9e6976 (diff) | |
| download | CMake-6511654164dd483b4ff0c3eb5775d5fdb2c53564.zip CMake-6511654164dd483b4ff0c3eb5775d5fdb2c53564.tar.gz CMake-6511654164dd483b4ff0c3eb5775d5fdb2c53564.tar.bz2 | |
cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search
While at it, convert to inline initialization.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 488ff2e..499efbb 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -139,7 +139,6 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator( "ProductDir", vc10Express, cmSystemTools::KeyWOW64_32); this->CudaEnabled = false; - this->MSBuildCommandInitialized = false; { std::string envPlatformToolset; if (cmSystemTools::GetEnv("PlatformToolset", envPlatformToolset) && diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index b7ae1ee..6c8e5f7 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -222,6 +222,7 @@ protected: bool SystemIsWindowsPhone = false; bool SystemIsWindowsStore = false; bool SystemIsAndroid = false; + bool MSBuildCommandInitialized = false; private: class Factory; @@ -243,7 +244,6 @@ private: LongestSourcePath LongestSource; std::string MSBuildCommand; - bool MSBuildCommandInitialized; std::set<std::string> AndroidExecutableWarnings; virtual std::string FindMSBuildCommand(); std::string FindDevEnvCommand() override; |