kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMakeDetermineCompilerId: Drop unused code path

Browse Source 
The execute_process command always exists so we never need to fall back on
exec_program.
This commit is contained in:
Brad King 2015-09-18 09:13:32 -04:00
parent e3ace61212
commit c73fbda66b
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Modules/CMakeDetermineCompilerId.cmake
View File

@ -314,29 +314,17 @@ Id flags: ${testflags}
endif() endif()
endif() endif()
else() else()
if(COMMAND EXECUTE_PROCESS) execute_process(
execute_process( COMMAND "${CMAKE_${lang}_COMPILER}"
COMMAND "${CMAKE_${lang}_COMPILER}" ${CMAKE_${lang}_COMPILER_ID_ARG1}
${CMAKE_${lang}_COMPILER_ID_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} ${testflags}
${testflags} "${src}"
"${src}" WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}
WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR} OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT ERROR_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
ERROR_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT RESULT_VARIABLE CMAKE_${lang}_COMPILER_ID_RESULT
RESULT_VARIABLE CMAKE_${lang}_COMPILER_ID_RESULT )
)
else()
exec_program(
"${CMAKE_${lang}_COMPILER}" ${CMAKE_${lang}_COMPILER_ID_DIR}
ARGS ${CMAKE_${lang}_COMPILER_ID_ARG1}
${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
${testflags}
\"${src}\"
OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
RETURN_VALUE CMAKE_${lang}_COMPILER_ID_RESULT
)
endif()
endif() endif()
# Check the result of compilation. # Check the result of compilation.