[cmake-commits] alex committed CMakeASMInformation.cmake 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv13063

Modified Files:
	CMakeASMInformation.cmake 
Log Message:

ENH: add CMAKE_INCLUDE_FLAG_ASM${ASM_DIALECT} and don't allow preset
CMAKE_xxx_INFORMATION files

Alex


Index: CMakeASMInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeASMInformation.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMakeASMInformation.cmake	28 Jun 2007 13:14:27 -0000	1.1
+++ CMakeASMInformation.cmake	11 Jul 2007 17:39:51 -0000	1.2
@@ -6,6 +6,7 @@
   SET(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj)
 ENDIF(UNIX)
 
+SET(CMAKE_INCLUDE_FLAG_ASM${ASM_DIALECT} "-I")       # -I
 
 GET_FILENAME_COMPONENT(CMAKE_BASE_NAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME_WE)
 
@@ -15,19 +16,17 @@
 
 INCLUDE(Platform/${CMAKE_BASE_NAME} OPTIONAL)
 
-IF(CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_AND_PROCESSOR_INFO_FILE)
-  INCLUDE(${CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_AND_PROCESSOR_INFO_FILE} OPTIONAL)
-ELSE(CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_AND_PROCESSOR_INFO_FILE)
-  IF(CMAKE_SYSTEM_PROCESSOR)
-    INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL)
-  ENDIF(CMAKE_SYSTEM_PROCESSOR)
-ENDIF(CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_AND_PROCESSOR_INFO_FILE)
+IF(CMAKE_SYSTEM_PROCESSOR)
+  INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
+ENDIF(CMAKE_SYSTEM_PROCESSOR)
+IF(NOT _INCLUDED_FILE)
+  INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-ASM-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL)
+ENDIF(NOT _INCLUDED_FILE)
 
-IF(CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_INFO_FILE)
-  INCLUDE(${CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_INFO_FILE} OPTIONAL)
-ELSE(CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_INFO_FILE)
-  INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
-ENDIF(CMAKE_SYSTEM_AND_ASM${ASM_DIALECT}_COMPILER_INFO_FILE)
+INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
+IF(NOT _INCLUDED_FILE)
+  INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-ASM OPTIONAL)
+ENDIF(NOT _INCLUDED_FILE)
 
 IF(NOT CMAKE_ASM at ASM_DIALECT@_SOURCE_FILE_EXTENSIONS)
   SET(CMAKE_ASM at ASM_DIALECT@_SOURCE_FILE_EXTENSIONS s;S;asm)