[cmake-commits] king committed CMakeDetermineCompilerId.cmake 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeDetermineCompilerId.cmake 
Log Message:
BUG: Need to strip leading and trailing whitespace off the compiler 'ARG1'.  This fixes bug#6141.


Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CMakeDetermineCompilerId.cmake	10 Aug 2007 13:20:14 -0000	1.12
+++ CMakeDetermineCompilerId.cmake	15 Dec 2007 21:03:29 -0000	1.13
@@ -14,6 +14,9 @@
       "${CMAKE_${lang}_COMPILER_ID_SRC}")
   ENDIF(CMAKE_HOST_WIN32 AND NOT CMAKE_HOST_UNIX)
 
+  # Make sure the compiler arguments are clean.
+  STRING(STRIP "${CMAKE_${lang}_COMPILER_ARG1}" CMAKE_${lang}_COMPILER_ID_ARG1)
+
   # Make sure user-specified compiler flags are used.
   IF(CMAKE_${lang}_FLAGS)
     SET(CMAKE_${lang}_COMPILER_ID_FLAGS ${CMAKE_${lang}_FLAGS})
@@ -30,7 +33,7 @@
   STRING(REGEX REPLACE " " ";" CMAKE_${lang}_COMPILER_ID_FLAGS_LIST "${CMAKE_${lang}_COMPILER_ID_FLAGS}")
   IF(COMMAND EXECUTE_PROCESS)
     EXECUTE_PROCESS(
-      COMMAND ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} ${CMAKE_${lang}_COMPILER_ID_SRC}
+      COMMAND ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} ${CMAKE_${lang}_COMPILER_ID_SRC}
       WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}
       OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
       ERROR_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
@@ -39,7 +42,7 @@
   ELSE(COMMAND EXECUTE_PROCESS)
     EXEC_PROGRAM(
       ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_DIR}
-      ARGS ${CMAKE_${lang}_COMPILER_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} \"${CMAKE_${lang}_COMPILER_ID_SRC}\"
+      ARGS ${CMAKE_${lang}_COMPILER_ID_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} \"${CMAKE_${lang}_COMPILER_ID_SRC}\"
       OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
       RETURN_VALUE CMAKE_${lang}_COMPILER_ID_RESULT
       )