diff options
| author | Brad King <brad.king@kitware.com> | 2007-12-15 21:03:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-12-15 21:03:29 (GMT) |
| commit | 04c8544a1dd7a36c5cfcf3283aaa215d9d12c200 (patch) | |
| tree | 394e9ce12c7ca3b9c64f22e6b2abb0e21986ac0c /Modules/CMakeDetermineCompilerId.cmake | |
| parent | f860026155afd807727d95b0aa243f3ff4a0d02d (diff) | |
| download | CMake-04c8544a1dd7a36c5cfcf3283aaa215d9d12c200.zip CMake-04c8544a1dd7a36c5cfcf3283aaa215d9d12c200.tar.gz CMake-04c8544a1dd7a36c5cfcf3283aaa215d9d12c200.tar.bz2 | |
BUG: Need to strip leading and trailing whitespace off the compiler 'ARG1'. This fixes bug#6141.
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index f212c5d..b3417d3 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -14,6 +14,9 @@ MACRO(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) "${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 @@ MACRO(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) 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 @@ MACRO(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) 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 ) |