summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeASMInformation.cmake
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/CMakeASMInformation.cmake
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/CMakeASMInformation.cmake')
-rw-r--r--Modules/CMakeASMInformation.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake
index b94303e..f86595c 100644
--- a/Modules/CMakeASMInformation.cmake
+++ b/Modules/CMakeASMInformation.cmake
@@ -34,6 +34,9 @@ IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
INCLUDE(Compiler/${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}-ASM${ASM_DIALECT} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
IF(NOT _INCLUDED_FILE)
+ IF("ASM${ASM_DIALECT}" STREQUAL "ASM")
+ MESSAGE(FATAL_ERROR "Did not find file Compiler/${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}-ASM${ASM_DIALECT}")
+ ENDIF("ASM${ASM_DIALECT}" STREQUAL "ASM")
INCLUDE(Platform/${CMAKE_BASE_NAME} OPTIONAL)
ENDIF(NOT _INCLUDED_FILE)