diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-28 12:39:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-28 12:39:29 (GMT) |
| commit | 16df2456a440d87fb3e8e53fb59a2817b288b9af (patch) | |
| tree | a44c27696661e6edd6222dc01e4d783f3821010c /Modules/CMakeDetermineCXXCompiler.cmake | |
| parent | ecc6d7f9190a660c0f442c4d03854b06e3fc7856 (diff) | |
| parent | 3e04946f7b69418f6b222875ad18fed3438e0fa1 (diff) | |
| download | CMake-16df2456a440d87fb3e8e53fb59a2817b288b9af.zip CMake-16df2456a440d87fb3e8e53fb59a2817b288b9af.tar.gz CMake-16df2456a440d87fb3e8e53fb59a2817b288b9af.tar.bz2 | |
Merge topic 'enable-language-require-compiler'
3e04946 Require CMAKE_<LANG>_COMPILER to be found as a full path
6007f7c CMakeDetermineCompilerId: Always use compiler detected from IDE
332771c CMakeDetermine*Compiler: Remove temporary cache entry
Diffstat (limited to 'Modules/CMakeDetermineCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 37de40d..ffb8504 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -91,10 +91,10 @@ else() get_filename_component(_CMAKE_USER_CXX_COMPILER_PATH "${CMAKE_CXX_COMPILER}" PATH) if(NOT _CMAKE_USER_CXX_COMPILER_PATH) find_program(CMAKE_CXX_COMPILER_WITH_PATH NAMES ${CMAKE_CXX_COMPILER}) - mark_as_advanced(CMAKE_CXX_COMPILER_WITH_PATH) if(CMAKE_CXX_COMPILER_WITH_PATH) set(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER_WITH_PATH} CACHE STRING "CXX compiler" FORCE) endif() + unset(CMAKE_CXX_COMPILER_WITH_PATH CACHE) endif() endif() mark_as_advanced(CMAKE_CXX_COMPILER) |