[cmake-commits] alex committed CMakeLists.txt 1.2 1.3 main-linux-x86-gas.s 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Assembler
In directory public:/mounts/ram/cvs-serv22487

Modified Files:
	CMakeLists.txt main-linux-x86-gas.s 
Log Message:

COMP: skip APPLE, since there with universal binaries the assembler file would be built for both architectures

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Assembler/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CMakeLists.txt	5 Jul 2007 20:11:20 -0000	1.2
+++ CMakeLists.txt	5 Jul 2007 20:32:40 -0000	1.3
@@ -3,7 +3,7 @@
 set(SRCS)
 
 # if no file has been set as source and we are on linux with an x86 processor try to use the gas/as assembler
-if(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
+if(NOT SRCS AND NOT APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
 # if(NOT SRCS AND CMAKE_SYSTEM_NAME MATCHES Linux AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
   message(STATUS "Trying to enable ASM-ATT for Linux/x86")
   enable_language(ASM-ATT)
@@ -12,7 +12,7 @@
     # this assembler file was created using gcc -S main.c
     set(SRCS main-linux-x86-gas.s)
   endif(CMAKE_ASM-ATT_COMPILER_WORKS)
-endif(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
+endif(NOT SRCS AND NOT APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
 # endif(NOT SRCS AND CMAKE_SYSTEM_NAME MATCHES Linux AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
 
 if(NOT SRCS)

Index: main-linux-x86-gas.s
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Assembler/main-linux-x86-gas.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main-linux-x86-gas.s	5 Jul 2007 13:05:40 -0000	1.1
+++ main-linux-x86-gas.s	5 Jul 2007 20:32:40 -0000	1.2
@@ -1,4 +1,3 @@
-	.file	"main.c"
 	.section	.rodata
 	.align 4
 .LC0: