diff options
author | Brad King <brad.king@kitware.com> | 2013-11-15 15:41:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-11-18 16:30:50 (GMT) |
commit | 558c74d0abfe4f4fc8563ba615b7329083d232bc (patch) | |
tree | 31b9d14dc5f90065b28543890a1ab38716bfa571 /Source/cmGlobalVisualStudioGenerator.h | |
parent | 5229f2df63369af1734783ee190cbfc7c41fac8f (diff) | |
download | CMake-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/cmGlobalVisualStudioGenerator.h')
-rw-r--r-- | Source/cmGlobalVisualStudioGenerator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index ce03a0e..da2d021 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -82,6 +82,8 @@ public: }; class OrderedTargetDependSet; + virtual void FindMakeProgram(cmMakefile*); + protected: // Does this VS version link targets to each other if there are // dependencies in the SLN file? This was done for VS versions @@ -107,6 +109,7 @@ protected: const char* AdditionalPlatformDefinition; private: + virtual std::string GetVSMakeProgram() = 0; void PrintCompilerAdvice(std::ostream&, std::string, const char*) {} void ComputeTargetObjects(cmGeneratorTarget* gt) const; |