diff options
| author | David Cole <david.cole@kitware.com> | 2011-10-11 18:45:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-11 18:45:27 (GMT) |
| commit | c8e92de286cd86c0a808e8a1c7a81dc9481c6153 (patch) | |
| tree | 54c6c428db927085a5ba649d193a73d9cc14dd31 /Source | |
| parent | 296fde32dd1dea294ac237adb4a2e1767f3ec08e (diff) | |
| parent | e36a1be46694796277b68e61d7312475babb4e0c (diff) | |
| download | CMake-c8e92de286cd86c0a808e8a1c7a81dc9481c6153.zip CMake-c8e92de286cd86c0a808e8a1c7a81dc9481c6153.tar.gz CMake-c8e92de286cd86c0a808e8a1c7a81dc9481c6153.tar.bz2 | |
Merge topic 'DependencyScanningForASM'
e36a1be fix #12262: use the C dependency scanner also for ASM files
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 2eae9d0..da6a1c6 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1559,7 +1559,7 @@ cmLocalUnixMakefileGenerator3 // Create the scanner for this language cmDepends *scanner = 0; - if(lang == "C" || lang == "CXX" || lang == "RC") + if(lang == "C" || lang == "CXX" || lang == "RC" || lang == "ASM") { // TODO: Handle RC (resource files) dependencies correctly. scanner = new cmDependsC(this, targetDir, lang.c_str(), &validDeps); |