diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-06-27 18:55:42 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-06-27 18:55:42 (GMT) |
| commit | d44bd2551c1c321b16be881e1bd7092d81c7bb13 (patch) | |
| tree | eda4006bc7cec0e81d5f3cc4df91d8e181697684 | |
| parent | 04525424af1ad0721aa04627da40aa37e717c7a2 (diff) | |
| download | CMake-d44bd2551c1c321b16be881e1bd7092d81c7bb13.zip CMake-d44bd2551c1c321b16be881e1bd7092d81c7bb13.tar.gz CMake-d44bd2551c1c321b16be881e1bd7092d81c7bb13.tar.bz2 | |
BUG: use ${LANG}_COMPILER_ARG1 also here, otherwise some compilers won't be
able to compile e.g. the C++ source file (e.g. the ADSP compiler needs -c++
for compiling C++ files)
Alex
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 121dbc7..9418293 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -30,7 +30,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_ID_FLAGS_LIST} ${CMAKE_${lang}_COMPILER_ID_SRC} + COMMAND ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_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 +39,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_ID_FLAGS_LIST} \"${CMAKE_${lang}_COMPILER_ID_SRC}\" + ARGS ${CMAKE_${lang}_COMPILER_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 ) |