浏览代码

CMakeDetermine(C|CXX)Compiler: Consider Clang compilers

Look for "clang" or "clang++" compiler executables so Clang will be used
when it is the only compiler available.  Prefer them last to avoid
changing compiler default preferences for existing scripts.
Brad King 13 年之前
父节点
当前提交
b708f1a2b9
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      Modules/CMakeDetermineCCompiler.cmake
  2. 1 1
      Modules/CMakeDetermineCXXCompiler.cmake

+ 1 - 1
Modules/CMakeDetermineCCompiler.cmake

@@ -56,7 +56,7 @@ IF(NOT CMAKE_C_COMPILER)
   IF(CMAKE_C_COMPILER_INIT)
   IF(CMAKE_C_COMPILER_INIT)
     SET(CMAKE_C_COMPILER_LIST ${CMAKE_C_COMPILER_INIT})
     SET(CMAKE_C_COMPILER_LIST ${CMAKE_C_COMPILER_INIT})
   ELSE(CMAKE_C_COMPILER_INIT)
   ELSE(CMAKE_C_COMPILER_INIT)
-    SET(CMAKE_C_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc)
+    SET(CMAKE_C_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc clang)
   ENDIF(CMAKE_C_COMPILER_INIT)
   ENDIF(CMAKE_C_COMPILER_INIT)
 
 
   # Find the compiler.
   # Find the compiler.

+ 1 - 1
Modules/CMakeDetermineCXXCompiler.cmake

@@ -55,7 +55,7 @@ IF(NOT CMAKE_CXX_COMPILER)
   IF(CMAKE_CXX_COMPILER_INIT)
   IF(CMAKE_CXX_COMPILER_INIT)
     SET(CMAKE_CXX_COMPILER_LIST ${CMAKE_CXX_COMPILER_INIT})
     SET(CMAKE_CXX_COMPILER_LIST ${CMAKE_CXX_COMPILER_INIT})
   ELSE(CMAKE_CXX_COMPILER_INIT)
   ELSE(CMAKE_CXX_COMPILER_INIT)
-    SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC)
+    SET(CMAKE_CXX_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC clang++)
   ENDIF(CMAKE_CXX_COMPILER_INIT)
   ENDIF(CMAKE_CXX_COMPILER_INIT)
 
 
   # Find the compiler.
   # Find the compiler.