summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-15 15:41:45 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-18 16:30:50 (GMT)
commit558c74d0abfe4f4fc8563ba615b7329083d232bc (patch)
tree31b9d14dc5f90065b28543890a1ab38716bfa571 /Source/cmGlobalVisualStudio7Generator.h
parent5229f2df63369af1734783ee190cbfc7c41fac8f (diff)
downloadCMake-558c74d0abfe4f4fc8563ba615b7329083d232bc.zip
CMake-558c74d0abfe4f4fc8563ba615b7329083d232bc.tar.gz
CMake-558c74d0abfe4f4fc8563ba615b7329083d232bc.tar.bz2
VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators
Drop the "Modules/CMakeVS*FindMake.cmake" files. Override the cmGlobalGenerator::FindMakeProgram method for VS generators to use their internal APIs to locate the build tool. Set the CMAKE_MAKE_PROGRAM as a normal variable for use by project code, but do not cache it. This will allow CMake and CTest to select the proper tool at build time.
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index d272fa0..c7b0081 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -173,6 +173,7 @@ private:
char* IntelProjectVersion;
std::string DevEnvCommand;
bool DevEnvCommandInitialized;
+ virtual std::string GetVSMakeProgram() { return this->GetDevEnvCommand(); }
};
#define CMAKE_CHECK_BUILD_SYSTEM_TARGET "ZERO_CHECK"