[cmake-commits] alex committed CMakeLists.txt 1.4 1.5 main.c 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt main.c 
Log Message:

COMP: OPTIONAL was missing in ENABLE_LANGUAGE()
-the assembler file seems to work for Linux and FreeBSD
-try to fix main() for HP-UX compiler

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Assembler/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CMakeLists.txt	5 Jul 2007 20:38:16 -0000	1.4
+++ CMakeLists.txt	6 Jul 2007 12:53:16 -0000	1.5
@@ -2,20 +2,19 @@
 
 set(SRCS)
 
-message(STATUS "Testing assembler support, system: ${CMAKE_SYSTEM_NAME} processor: ${CMAKE_SYSTEM_PROCESSOR}")
-
 # 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 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)
-  if(CMAKE_ASM-ATT_COMPILER_WORKS)
-    message(STATUS "Trying to enable ASM-ATT for Linux/x86 - succeeded")
-    # 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 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$")
+# main-linux-x86-gas.s seems to work for Linux and FreeBSD
+if(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
+  if(CMAKE_SYSTEM MATCHES Linux or CMAKE_SYSTEM MATCHES FreeBSD)
+    message(STATUS "Trying to enable ASM-ATT for Linux or FreeBSD on x86")
+    enable_language(ASM-ATT OPTIONAL)
+    if(CMAKE_ASM-ATT_COMPILER_WORKS)
+      message(STATUS "Trying to enable ASM-ATT for Linux/x86 - succeeded")
+      # this assembler file was created using gcc -S main.c
+      set(SRCS main-linux-x86-gas.s)
+    endif(CMAKE_ASM-ATT_COMPILER_WORKS)
+  endif(CMAKE_SYSTEM MATCHES Linux or CMAKE_SYSTEM MATCHES FreeBSD)
+endif(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")
 
 if(NOT SRCS)
   message(STATUS "No assembler enabled, using C")

Index: main.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Assembler/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c	5 Jul 2007 13:05:40 -0000	1.1
+++ main.c	6 Jul 2007 12:53:16 -0000	1.2
@@ -1,6 +1,12 @@
 #include <stdio.h>
 
-int main(int argc, char** argv)
+#ifdef __CLASSIC_C__
+int main(){
+  int ac;
+  char*av[];
+#else
+int main(int ac, char*av[]){
+#endif
 {
   printf("hello assembler world, %d arguments  given\n", argc);
   return 0;