diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-01-25 16:41:05 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-01-25 16:41:05 (GMT) |
| commit | aa98e3647dff8cfc66f5ef4f93e044543c93b02a (patch) | |
| tree | 7bc09ebd666025951a2cd5598c3df8e9ddb7b6e9 /Modules | |
| parent | 269b66d50aba8285f3ad7935141968dd33dcd820 (diff) | |
| download | CMake-aa98e3647dff8cfc66f5ef4f93e044543c93b02a.zip CMake-aa98e3647dff8cfc66f5ef4f93e044543c93b02a.tar.gz CMake-aa98e3647dff8cfc66f5ef4f93e044543c93b02a.tar.bz2 | |
ENH: fix more than one argument passed in to compilers via environment
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCCompiler.cmake.in | 2 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompiler.cmake.in | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineFortranCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineJavaCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineRCCompiler.cmake | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in index dcd8054..bc21327 100644 --- a/Modules/CMakeCCompiler.cmake.in +++ b/Modules/CMakeCCompiler.cmake.in @@ -1,5 +1,5 @@ SET(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@") -SET(CMAKE_C_COMPILER_ARG1 @CMAKE_C_COMPILER_ARG1@) +SET(CMAKE_C_COMPILER_ARG1 "@CMAKE_C_COMPILER_ARG1@") SET(CMAKE_AR "@CMAKE_AR@") SET(CMAKE_RANLIB "@CMAKE_RANLIB@") SET(CMAKE_COMPILER_IS_GNUCC @CMAKE_COMPILER_IS_GNUCC@) diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in index b2463a1..d4b0ee8 100644 --- a/Modules/CMakeCXXCompiler.cmake.in +++ b/Modules/CMakeCXXCompiler.cmake.in @@ -1,5 +1,5 @@ SET(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@") -SET(CMAKE_CXX_COMPILER_ARG1 @CMAKE_CXX_COMPILER_ARG1@) +SET(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@") SET(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@) SET(CMAKE_CXX_COMPILER_LOADED 1) SET(CMAKE_COMPILER_IS_GNUCXX_RUN 1) diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 82b7c62..cd74194 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -13,7 +13,7 @@ IF(NOT CMAKE_C_COMPILER) IF($ENV{CC} MATCHES ".+") GET_FILENAME_COMPONENT(CMAKE_C_COMPILER_INIT $ENV{CC} PROGRAM PROGRAM_ARGS CMAKE_C_FLAGS_ENV_INIT) IF(CMAKE_C_FLAGS_ENV_INIT) - SET(CMAKE_C_COMPILER_ARG1 ${CMAKE_C_FLAGS_ENV_INIT} CACHE STRING "First argument to C compiler") + SET(CMAKE_C_COMPILER_ARG1 "${CMAKE_C_FLAGS_ENV_INIT}" CACHE STRING "First argument to C compiler") ENDIF(CMAKE_C_FLAGS_ENV_INIT) IF(EXISTS ${CMAKE_C_COMPILER_INIT}) ELSE(EXISTS ${CMAKE_C_COMPILER_INIT}) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 18aa4a3..c548594 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -13,7 +13,7 @@ IF(NOT CMAKE_CXX_COMPILER) IF($ENV{CXX} MATCHES ".+") GET_FILENAME_COMPONENT(CMAKE_CXX_COMPILER_INIT $ENV{CXX} PROGRAM PROGRAM_ARGS CMAKE_CXX_FLAGS_ENV_INIT) IF(CMAKE_CXX_FLAGS_ENV_INIT) - SET(CMAKE_CXX_COMPILER_ARG1 ${CMAKE_CXX_FLAGS_ENV_INIT} CACHE STRING "First argument to CXX compiler") + SET(CMAKE_CXX_COMPILER_ARG1 "${CMAKE_CXX_FLAGS_ENV_INIT}" CACHE STRING "First argument to CXX compiler") ENDIF(CMAKE_CXX_FLAGS_ENV_INIT) IF(EXISTS ${CMAKE_CXX_COMPILER_INIT}) ELSE(EXISTS ${CMAKE_CXX_COMPILER_INIT}) diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake index d621135..812a544 100644 --- a/Modules/CMakeDetermineFortranCompiler.cmake +++ b/Modules/CMakeDetermineFortranCompiler.cmake @@ -10,7 +10,7 @@ IF(NOT CMAKE_Fortran_COMPILER) IF($ENV{FC} MATCHES ".+") GET_FILENAME_COMPONENT(CMAKE_Fortran_COMPILER_INIT $ENV{FC} PROGRAM PROGRAM_ARGS CMAKE_Fortran_FLAGS_ENV_INIT) IF(CMAKE_Fortran_FLAGS_ENV_INIT) - SET(CMAKE_Fortran_COMPILER_ARG1 ${CMAKE_Fortran_FLAGS_ENV_INIT} CACHE STRING "First argument to Fortran compiler") + SET(CMAKE_Fortran_COMPILER_ARG1 "${CMAKE_Fortran_FLAGS_ENV_INIT}" CACHE STRING "First argument to Fortran compiler") ENDIF(CMAKE_Fortran_FLAGS_ENV_INIT) IF(EXISTS ${CMAKE_Fortran_COMPILER_INIT}) ELSE(EXISTS ${CMAKE_Fortran_COMPILER_INIT}) diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake index dcd47d8..2edb46d 100644 --- a/Modules/CMakeDetermineJavaCompiler.cmake +++ b/Modules/CMakeDetermineJavaCompiler.cmake @@ -8,7 +8,7 @@ IF(NOT CMAKE_Java_COMPILER) IF($ENV{JAVA_COMPILER} MATCHES ".+") GET_FILENAME_COMPONENT(CMAKE_Java_COMPILER_INIT $ENV{JAVA_COMPILER} PROGRAM PROGRAM_ARGS CMAKE_Java_FLAGS_ENV_INIT) IF(CMAKE_Java_FLAGS_ENV_INIT) - SET(CMAKE_Java_COMPILER_ARG1 ${CMAKE_Java_FLAGS_ENV_INIT} CACHE STRING "First argument to Java compiler") + SET(CMAKE_Java_COMPILER_ARG1 "${CMAKE_Java_FLAGS_ENV_INIT}" CACHE STRING "First argument to Java compiler") ENDIF(CMAKE_Java_FLAGS_ENV_INIT) IF(EXISTS ${CMAKE_Java_COMPILER_INIT}) ELSE(EXISTS ${CMAKE_Java_COMPILER_INIT}) diff --git a/Modules/CMakeDetermineRCCompiler.cmake b/Modules/CMakeDetermineRCCompiler.cmake index b2c1cad..c5732b2 100644 --- a/Modules/CMakeDetermineRCCompiler.cmake +++ b/Modules/CMakeDetermineRCCompiler.cmake @@ -10,7 +10,7 @@ IF(NOT CMAKE_RC_COMPILER) IF($ENV{RC} MATCHES ".+") GET_FILENAME_COMPONENT(CMAKE_RC_COMPILER_INIT $ENV{RC} PROGRAM PROGRAM_ARGS CMAKE_RC_FLAGS_ENV_INIT) IF(CMAKE_RC_FLAGS_ENV_INIT) - SET(CMAKE_RC_COMPILER_ARG1 ${CMAKE_RC_FLAGS_ENV_INIT} CACHE STRING "First argument to RC compiler") + SET(CMAKE_RC_COMPILER_ARG1 "${CMAKE_RC_FLAGS_ENV_INIT}" CACHE STRING "First argument to RC compiler") ENDIF(CMAKE_RC_FLAGS_ENV_INIT) IF(EXISTS ${CMAKE_RC_COMPILER_INIT}) ELSE(EXISTS ${CMAKE_RC_COMPILER_INIT}) |