diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-13 15:50:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-13 18:47:49 (GMT) |
| commit | 5b0a46e1c93f99c8ba5fadbc3224a3721d95aa64 (patch) | |
| tree | 80d2e3566a2f30b5e57c597d23344acf06342140 | |
| parent | 802dbe52399dd2330020b94d12e594b46f85e70a (diff) | |
| download | CMake-5b0a46e1c93f99c8ba5fadbc3224a3721d95aa64.zip CMake-5b0a46e1c93f99c8ba5fadbc3224a3721d95aa64.tar.gz CMake-5b0a46e1c93f99c8ba5fadbc3224a3721d95aa64.tar.bz2 | |
ASM_MASM: Do not require compiler to be a full path
The compiler detection modules for this language do not yet know how
to find the full path to 'ml' or 'ml64', so do not require it.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 3f948b5..3681515 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -620,7 +620,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, "No " << compilerName << " could be found.\n" ; } - else if(strcmp(lang, "RC") != 0) + else if(strcmp(lang, "RC") != 0 && + strcmp(lang, "ASM_MASM") != 0) { if(!cmSystemTools::FileIsFullPath(compilerFile)) { |