Browse Source

Fix the default CMAKE_ASM_COMPILE_OBJECT, make XL-ASM use it

Alex
Alex Neundorf 14 years ago
parent
commit
78f7c592eb
2 changed files with 1 additions and 3 deletions
  1. 1 1
      Modules/CMakeASMInformation.cmake
  2. 0 2
      Modules/Compiler/XL-ASM.cmake

+ 1 - 1
Modules/CMakeASMInformation.cmake

@@ -90,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> <DEFINES> <FLAGS> -o <OBJECT> <SOURCE>")
+  SET(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
 ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)
 
 IF(NOT CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY)

+ 0 - 2
Modules/Compiler/XL-ASM.cmake

@@ -11,5 +11,3 @@ SET(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-O -DNDEBUG")
 SET(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-g")
 
 SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s )
-
-SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <FLAGS> -o <OBJECT>   -c <SOURCE>")