From 74564615889e35b8794e62325aa10d46d525bba4 Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sat, 12 Feb 2011 16:15:59 +0100
Subject: Change the default rules so they fit better to the new ASM handling

CMAKE_ASM_COMPILE_OBJECT is now so that it fits for GNU, Intel, HP and Sun
ASM_ATT had to be adjusted. Also adjusted the default
CMAKE_ASM_LINK_EXECUTABLE

Alex
---
 Modules/CMakeASMInformation.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Modules/CMakeASMInformation.cmake')

diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake
index f86595c2fd..839eef019f 100644
--- a/Modules/CMakeASMInformation.cmake
+++ b/Modules/CMakeASMInformation.cmake
@@ -12,8 +12,6 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-MESSAGE(STATUS "Loaded CMakeASM${ASM_DIALECT}Information - ASM${ASM_DIALECT} support is still experimental, please report issues")
-
 IF(UNIX)
   SET(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .o)
 ELSE(UNIX)
@@ -92,7 +90,7 @@ MARK_AS_ADVANCED(CMAKE_ASM${ASM_DIALECT}_FLAGS
 
 
 IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)
-  SET(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
+  SET(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> <SOURCE>")
 ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)
 
 IF(NOT CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY)
@@ -103,7 +101,7 @@ ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY)
 
 IF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE)
   SET(CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE
-    "<CMAKE_LINKER> <FLAGS> <CMAKE_ASM${ASM_DIALECT}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>")
+    "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> <CMAKE_ASM${ASM_DIALECT}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>")
 ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE)
 
 # to be done
-- 
cgit v1.2.1