summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNMakeMakefileGenerator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-12-05 18:44:11 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-12-05 18:44:11 (GMT)
commit96189f79d582f90758ba1b4f691031b1d7fa02f3 (patch)
tree36bc488b7a77d01a9b9be3b1e4b0ab8963378fdc /Source/cmGlobalNMakeMakefileGenerator.cxx
parent8d20322160e6e8c7bf9c6d69de9319f57373de5d (diff)
downloadCMake-96189f79d582f90758ba1b4f691031b1d7fa02f3.zip
CMake-96189f79d582f90758ba1b4f691031b1d7fa02f3.tar.gz
CMake-96189f79d582f90758ba1b4f691031b1d7fa02f3.tar.bz2
ENH: unify EnableLanguage across all generators
Diffstat (limited to 'Source/cmGlobalNMakeMakefileGenerator.cxx')
-rw-r--r--Source/cmGlobalNMakeMakefileGenerator.cxx15
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 318b428..abf3426 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -18,21 +18,18 @@
#include "cmLocalUnixMakefileGenerator.h"
#include "cmMakefile.h"
+
+cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator()
+{
+ m_FindMakeProgramFile = "CMakeNMakeFindMake.cmake";
+}
+
void cmGlobalNMakeMakefileGenerator::EnableLanguage(const char* l,
cmMakefile *mf)
{
// pick a default
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
- if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")
- || cmSystemTools::IsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM")))
- {
- std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT");
- setMakeProgram += "/Modules/CMakeNMakeFindMake.cmake";
- mf->ReadListFile(0, setMakeProgram.c_str());
- }
-
-
this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf);
}