diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:39:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:39:09 (GMT) |
| commit | b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa (patch) | |
| tree | ce60059575c724db2fd9ed4639ac3f9353ee6005 /Source | |
| parent | 2582994e57004d02f5609f9d5c2c57071140fdf8 (diff) | |
| parent | 97140d398668c0ab708ac3e0ec72c57605d6f4a9 (diff) | |
| download | CMake-b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa.zip CMake-b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa.tar.gz CMake-b7f3cc22c3e4c3ff40efcc0f0a516148b9bc43fa.tar.bz2 | |
Merge topic 'xcode-asm'
97140d3 Tests/Assembler: Do not use assembler in universal binaries
f3477ed Xcode: Set ASM source language in project file (#13472)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ae92a0a..e8ab38f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -787,6 +787,10 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext, { sourcecode += ".fortran.f90"; } + else if(lang == "ASM") + { + sourcecode += ".asm"; + } //else // { // // Already specialized above or we leave sourcecode == "sourcecode" |