summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-05 14:24:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-05 14:24:59 (GMT)
commit520ead7200334fddcbef94c657de025abe5cf134 (patch)
treec6faa3f3d792a1efff4da8f1618841167657b053 /Source/cmGlobalVisualStudio10Generator.cxx
parent7974dbb0ffe9c4abb314ec6baff4f0af1d99e5f5 (diff)
parente4201248ce76be40c109b67e68a4e295d709e2dc (diff)
downloadCMake-520ead7200334fddcbef94c657de025abe5cf134.zip
CMake-520ead7200334fddcbef94c657de025abe5cf134.tar.gz
CMake-520ead7200334fddcbef94c657de025abe5cf134.tar.bz2
Merge topic 'cleanup-build-commands'
e420124 CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND 0c55729 VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 7d4abbd..6983ef9 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -256,6 +256,14 @@ std::string cmGlobalVisualStudio10Generator::GetUserMacrosRegKeyBase()
}
//----------------------------------------------------------------------------
+void cmGlobalVisualStudio10Generator::FindMakeProgram(cmMakefile* mf)
+{
+ this->cmGlobalVisualStudio8Generator::FindMakeProgram(mf);
+ mf->AddDefinition("CMAKE_VS_MSBUILD_COMMAND",
+ this->GetMSBuildCommand().c_str());
+}
+
+//----------------------------------------------------------------------------
std::string const& cmGlobalVisualStudio10Generator::GetMSBuildCommand()
{
if(!this->MSBuildCommandInitialized)