diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 20:57:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-10 21:12:00 (GMT) |
| commit | 8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248 (patch) | |
| tree | 3f3710543d3d3305b0b2ff1d0b611a864a33dfa8 | |
| parent | 6852fb8034d30d14498dc874378881696a6ada23 (diff) | |
| download | CMake-8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248.zip CMake-8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248.tar.gz CMake-8c9bfac3848bc2c53c034b03cf89a3aaa8f3a248.tar.bz2 | |
Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible
During cross-compiling the toolchain file may use CMakeForceCompiler to
force a compiler setting. When using the Xcode generator try to convert
it to a full path by searching the PATH as is done for the Makefile
generators.
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 1 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 1 | ||||
| -rw-r--r-- | Modules/CMakeDetermineFortranCompiler.cmake | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 4f7ae24..aa4cdc9 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -42,6 +42,7 @@ endif() if(${CMAKE_GENERATOR} MATCHES "Visual Studio") elseif("${CMAKE_GENERATOR}" MATCHES "Xcode") set(CMAKE_C_COMPILER_XCODE_TYPE sourcecode.c.c) + _cmake_find_compiler_path(C) else() if(NOT CMAKE_C_COMPILER) set(CMAKE_C_COMPILER_INIT NOTFOUND) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index d60cff3..ef8445e 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -41,6 +41,7 @@ endif() if(${CMAKE_GENERATOR} MATCHES "Visual Studio") elseif("${CMAKE_GENERATOR}" MATCHES "Xcode") set(CMAKE_CXX_COMPILER_XCODE_TYPE sourcecode.cpp.cpp) + _cmake_find_compiler_path(CXX) else() if(NOT CMAKE_CXX_COMPILER) set(CMAKE_CXX_COMPILER_INIT NOTFOUND) diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake index f4aaa0a..d38bf25 100644 --- a/Modules/CMakeDetermineFortranCompiler.cmake +++ b/Modules/CMakeDetermineFortranCompiler.cmake @@ -28,6 +28,7 @@ endif() if(${CMAKE_GENERATOR} MATCHES "Visual Studio") elseif("${CMAKE_GENERATOR}" MATCHES "Xcode") set(CMAKE_Fortran_COMPILER_XCODE_TYPE sourcecode.fortran.f90) + _cmake_find_compiler_path(Fortran) else() if(NOT CMAKE_Fortran_COMPILER) # prefer the environment variable CC |