summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeASMCompiler.cmake.in
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2011-01-30 20:03:37 (GMT)
committerAlex Neundorf <neundorf@kde.org>2011-01-30 20:03:37 (GMT)
commit4b40d4297aa7b984e9b5fa905cdee21960ec4f8a (patch)
treee880f1e36a8245ac9e6c82a0f96258f5c8a3cca2 /Modules/CMakeASMCompiler.cmake.in
parent9c30d3d230229dbd791bcaf1b57e5bc23350cb30 (diff)
downloadCMake-4b40d4297aa7b984e9b5fa905cdee21960ec4f8a.zip
CMake-4b40d4297aa7b984e9b5fa905cdee21960ec4f8a.tar.gz
CMake-4b40d4297aa7b984e9b5fa905cdee21960ec4f8a.tar.bz2
Rework the way assembler is handled, use the C/CXX compiler by default
This commit changes the way how the assembler support works in cmake. The language "ASM" now always uses the C/Cxx compiler instead of the assembler directly. This fixes #8392, assembler files are not preprocessed. If one wants to use the assembler directly, the specific assembler "dialect" has to be enabled. I.e. to get as/gas, you have to use now ASM-ATT, the same way for ASM_MASM and ASM_NASM. Implemented this now for gcc. SunStudio, IBM, HP and Intel still todo. Alex
Diffstat (limited to 'Modules/CMakeASMCompiler.cmake.in')
-rw-r--r--Modules/CMakeASMCompiler.cmake.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CMakeASMCompiler.cmake.in b/Modules/CMakeASMCompiler.cmake.in
index 230805b..2dc24b0 100644
--- a/Modules/CMakeASMCompiler.cmake.in
+++ b/Modules/CMakeASMCompiler.cmake.in
@@ -4,6 +4,7 @@ SET(CMAKE_AR "@CMAKE_AR@")
SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
SET(CMAKE_LINKER "@CMAKE_LINKER@")
SET(CMAKE_ASM@ASM_DIALECT@_COMPILER_LOADED 1)
+SET(CMAKE_ASM@ASM_DIALECT@_COMPILER_ID "@_CMAKE_ASM_COMPILER_ID@")
SET(CMAKE_ASM@ASM_DIALECT@_COMPILER_ENV_VAR "@_CMAKE_ASM_COMPILER_ENV_VAR@")
SET(CMAKE_ASM@ASM_DIALECT@_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)