diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-23 12:20:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-23 12:20:08 (GMT) |
| commit | 7938e589e33fc7c9de1fa29e3ec128f1b38c2831 (patch) | |
| tree | b75e82f5fb51dbfb9bcd37b17423adef7a5323e3 | |
| parent | a8cfc218435b5adb92f9456f69b57f02ec1dcc43 (diff) | |
| parent | 705ae0049190dfa9e79e13c423c509b112a5e25b (diff) | |
| download | CMake-7938e589e33fc7c9de1fa29e3ec128f1b38c2831.zip CMake-7938e589e33fc7c9de1fa29e3ec128f1b38c2831.tar.gz CMake-7938e589e33fc7c9de1fa29e3ec128f1b38c2831.tar.bz2 | |
Merge topic 'vs-graceful-empty-compiler'
705ae00 Quote ${CMAKE_<LANG>_COMPILER} while enabling a language
18a2537 CMakeDetermineCompilerId: Do not test vendor without a compiler
| -rw-r--r-- | Modules/CMakeCInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeCXXInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 | ||||
| -rw-r--r-- | Modules/CMakeFortranInformation.cmake | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index ce5ce44..0f5b694 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -34,7 +34,7 @@ if(CMAKE_C_COMPILER_ID) endif() set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE) +get_filename_component(CMAKE_BASE_NAME "${CMAKE_C_COMPILER}" NAME_WE) if(CMAKE_COMPILER_IS_GNUCC) set(CMAKE_BASE_NAME gcc) endif() diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index 933c15a..45ec95a 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -34,7 +34,7 @@ if(CMAKE_CXX_COMPILER_ID) endif() set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE) +get_filename_component(CMAKE_BASE_NAME "${CMAKE_CXX_COMPILER}" NAME_WE) # since the gnu compiler has several names force g++ if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_BASE_NAME g++) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 0d7aa61..6fccb16 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -44,7 +44,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) endforeach() # If the compiler is still unknown, try to query its vendor. - if(NOT CMAKE_${lang}_COMPILER_ID) + if(CMAKE_${lang}_COMPILER AND NOT CMAKE_${lang}_COMPILER_ID) CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang}) endif() @@ -232,7 +232,7 @@ Id flags: ${testflags} else() if(COMMAND EXECUTE_PROCESS) execute_process( - COMMAND ${CMAKE_${lang}_COMPILER} + COMMAND "${CMAKE_${lang}_COMPILER}" ${CMAKE_${lang}_COMPILER_ID_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} ${testflags} @@ -244,7 +244,7 @@ Id flags: ${testflags} ) else() exec_program( - ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_DIR} + "${CMAKE_${lang}_COMPILER}" ${CMAKE_${lang}_COMPILER_ID_DIR} ARGS ${CMAKE_${lang}_COMPILER_ID_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} ${testflags} @@ -476,7 +476,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang) set(flags ${CMAKE_${lang}_COMPILER_ID_VENDOR_FLAGS_${vendor}}) set(regex ${CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor}}) execute_process( - COMMAND ${CMAKE_${lang}_COMPILER} + COMMAND "${CMAKE_${lang}_COMPILER}" ${CMAKE_${lang}_COMPILER_ID_ARG1} ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} ${flags} diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake index 512ec48..debfd46 100644 --- a/Modules/CMakeFortranInformation.cmake +++ b/Modules/CMakeFortranInformation.cmake @@ -24,7 +24,7 @@ if(CMAKE_Fortran_COMPILER_ID) endif() set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE) +get_filename_component(CMAKE_BASE_NAME "${CMAKE_Fortran_COMPILER}" NAME_WE) # since the gnu compiler has several names force g++ if(CMAKE_COMPILER_IS_GNUG77) set(CMAKE_BASE_NAME g77) |